From d14ecfdc5e12e44b03f4611fbd7aec3133158e1c Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Mon, 18 Jan 2016 21:54:02 -0600
Subject: [PATCH] Adjust playlist props

Instead of using clearProperties, clear individually.
---
 resources/lib/kodimonitor.py   |  2 +-
 resources/lib/playbackutils.py | 10 +++++-----
 resources/lib/player.py        |  5 +++--
 resources/lib/playlist.py      |  2 +-
 service.py                     |  4 +---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index aa9aa79c..05ecf8a5 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -200,5 +200,5 @@ class KodiMonitor(xbmc.Monitor):
             utils.window('emby_onWake', value="true")
 
         elif method == "Playlist.OnClear":
-            utils.window('emby_customPlaylist', clear=True, windowid=10008)
+            utils.window('emby_customPlaylist', clear=True)
             self.logMsg("Clear playlist properties.")
\ No newline at end of file
diff --git a/resources/lib/playbackutils.py b/resources/lib/playbackutils.py
index 777fe9e6..4ab5ba0f 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=10008) == "true"
+        propertiesPlayback = utils.window('emby_playbackProps') == "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=10008)
+            utils.window('emby_playbackProps', value="true")
             self.logMsg("Setting up properties in playlist.", 1)
 
             if (not homeScreen and not seektime and 
-                    utils.window('emby_customPlaylist', windowid=10008) != "true"):
+                    utils.window('emby_customPlaylist') != "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=10008)
+            utils.window('emby_playbackProps', clear=True)
 
         #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=10008) == "true") or
+        elif ((introsPlaylist and utils.window('emby_customPlaylist') == "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 1323548b..7972edec 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -400,8 +400,9 @@ class Player(xbmc.Player):
     def onPlayBackStopped( self ):
         # Will be called when user stops xbmc playing a file
         self.logMsg("ONPLAYBACK_STOPPED", 2)
-        xbmcgui.Window(10008).clearProperties()
-        self.logMsg("Clear playlist properties.")
+        utils.window('emby_customPlaylist', clear=True)
+        utils.window('emby_playbackProps', clear=True)
+        self.logMsg("Clear playlist properties.", 1)
         self.stopAll()
 
     def onPlayBackEnded( self ):
diff --git a/resources/lib/playlist.py b/resources/lib/playlist.py
index 9d2d9a95..c869f288 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=10008)
+        utils.window('emby_customplaylist', value="true")
 
         position = 0
 
diff --git a/service.py b/service.py
index 4c65cce5..b68145f2 100644
--- a/service.py
+++ b/service.py
@@ -71,13 +71,11 @@ class Service():
             "emby_online", "emby_serverStatus", "emby_onWake",
             "emby_syncRunning", "emby_dbCheck", "emby_kodiScan",
             "emby_shouldStop", "emby_currUser", "emby_dbScan", "emby_sessionId",
-            "emby_initialScan"
+            "emby_initialScan", "emby_customplaylist", "emby_playbackProps"
         ]
         for prop in properties:
             utils.window(prop, clear=True)
 
-        # Clear playlist properties
-        xbmcgui.Window(10008).clearProperties()
         # Clear video nodes properties
         videonodes.VideoNodes().clearProperties()