From f3f8c76197173e6f6ecf22642c5bfb61457a537a Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Mon, 18 Jan 2016 19:54:20 -0600 Subject: [PATCH] Fix progress dialog --- resources/lib/kodimonitor.py | 3 +-- resources/lib/playbackutils.py | 10 +++++----- resources/lib/player.py | 2 +- resources/lib/playlist.py | 2 +- service.py | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py index e4f25a6f..aa9aa79c 100644 --- a/resources/lib/kodimonitor.py +++ b/resources/lib/kodimonitor.py @@ -200,6 +200,5 @@ class KodiMonitor(xbmc.Monitor): utils.window('emby_onWake', value="true") elif method == "Playlist.OnClear": - utils.window('emby_customPlaylist', clear=True, windowid=10101) - #xbmcgui.Window(10101).clearProperties() + utils.window('emby_customPlaylist', clear=True, windowid=10008) self.logMsg("Clear playlist properties.") \ No newline at end of file diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py index affa2b81..777fe9e6 100644 --- a/resources/lib/playbackutils.py +++ b/resources/lib/playbackutils.py @@ -74,7 +74,7 @@ class PlaybackUtils(): sizePlaylist = playlist.size() currentPosition = startPos - propertiesPlayback = utils.window('emby_playbackProps', windowid=10101) == "true" + propertiesPlayback = utils.window('emby_playbackProps', windowid=10008) == "true" introsPlaylist = False dummyPlaylist = False @@ -91,11 +91,11 @@ class PlaybackUtils(): # Otherwise we get a loop. if not propertiesPlayback: - utils.window('emby_playbackProps', value="true", windowid=10101) + utils.window('emby_playbackProps', value="true", windowid=10008) self.logMsg("Setting up properties in playlist.", 1) if (not homeScreen and not seektime and - utils.window('emby_customPlaylist', windowid=10101) != "true"): + utils.window('emby_customPlaylist', windowid=10008) != "true"): self.logMsg("Adding dummy file to playlist.", 2) dummyPlaylist = True @@ -182,7 +182,7 @@ class PlaybackUtils(): # We just skipped adding properties. Reset flag for next time. elif propertiesPlayback: self.logMsg("Resetting properties playback flag.", 2) - utils.window('emby_playbackProps', clear=True, windowid=10101) + utils.window('emby_playbackProps', clear=True, windowid=10008) #self.pl.verifyPlaylist() ########## SETUP MAIN ITEM ########## @@ -202,7 +202,7 @@ class PlaybackUtils(): self.setListItem(listitem) xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, listitem) - elif ((introsPlaylist and utils.window('emby_customPlaylist', windowid=10101) == "true") or + elif ((introsPlaylist and utils.window('emby_customPlaylist', windowid=10008) == "true") or (homeScreen and not sizePlaylist)): # Playlist was created just now, play it. self.logMsg("Play playlist.", 1) diff --git a/resources/lib/player.py b/resources/lib/player.py index b6d25e19..1323548b 100644 --- a/resources/lib/player.py +++ b/resources/lib/player.py @@ -400,7 +400,7 @@ class Player(xbmc.Player): def onPlayBackStopped( self ): # Will be called when user stops xbmc playing a file self.logMsg("ONPLAYBACK_STOPPED", 2) - xbmcgui.Window(10101).clearProperties() + xbmcgui.Window(10008).clearProperties() self.logMsg("Clear playlist properties.") self.stopAll() diff --git a/resources/lib/playlist.py b/resources/lib/playlist.py index 03d07d39..9d2d9a95 100644 --- a/resources/lib/playlist.py +++ b/resources/lib/playlist.py @@ -51,7 +51,7 @@ class Playlist(): playlist.clear() started = False - utils.window('emby_customplaylist', value="true", windowid=10101) + utils.window('emby_customplaylist', value="true", windowid=10008) position = 0 diff --git a/service.py b/service.py index cfd36fdb..4c65cce5 100644 --- a/service.py +++ b/service.py @@ -77,7 +77,7 @@ class Service(): utils.window(prop, clear=True) # Clear playlist properties - xbmcgui.Window(10101).clearProperties() + xbmcgui.Window(10008).clearProperties() # Clear video nodes properties videonodes.VideoNodes().clearProperties()