Merge remote-tracking branch 'MediaBrowser/master' into develop

default.py

@@ -140,7 +140,7 @@ class Main:
             # Other functions
             if mode == "settings":
                 xbmc.executebuiltin('Addon.OpenSettings(plugin.video.plexkodiconnect)')
-            elif mode in ("manualsync", "repair"):
+            elif mode in ("manualsync", "fastsync", "repair"):
                 if utils.window('emby_online') != "true":
                     # Server is not online, do not run the sync
                     xbmcgui.Dialog().ok(heading="PlexKodiConnect",

resources/lib/kodimonitor.py

@@ -146,6 +146,13 @@ class KodiMonitor(xbmc.Monitor):
             xbmc.sleep(10000)
             utils.window('emby_onWake', value="true")
 
+
+        elif method == "GUI.OnScreensaverDeactivated":
+            if utils.settings('dbSyncScreensaver') == "true":
+                xbmc.sleep(5000);
+                utils.window('emby_onWake', value="true")
+
+
         elif method == "Playlist.OnClear":
             pass