From 0bd4a79ca31f92cd71ad1757472312935d648d60 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Sun, 15 May 2016 16:02:19 +0200
Subject: [PATCH] Merge conflicts: sync after screensaver deactivated

---
 default.py                             | 12 +++++++-----
 resources/language/English/strings.xml |  1 +
 resources/language/German/strings.xml  |  1 +
 resources/lib/kodimonitor.py           |  6 ++----
 resources/settings.xml                 |  1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/default.py b/default.py
index 63f65ca1..30271bec 100644
--- a/default.py
+++ b/default.py
@@ -140,13 +140,15 @@ class Main:
             # Other functions
             if mode == "settings":
                 xbmc.executebuiltin('Addon.OpenSettings(plugin.video.plexkodiconnect)')
-            elif mode in ("manualsync", "fastsync", "repair"):
+            elif mode in ("manualsync", "repair"):
                 if utils.window('emby_online') != "true":
                     # Server is not online, do not run the sync
-                    xbmcgui.Dialog().ok(heading="PlexKodiConnect",
-                                        line1=("Unable to run the sync, the add-on is not "
-                                               "connected to the Emby server."))
-                    utils.logMsg("PLEX", "Not connected to the emby server.", 1)
+                    xbmcgui.Dialog().ok(
+                        "PlexKodiConnect",
+                        "Unable to run the sync, the add-on is not connected "
+                        "to a Plex server.")
+                    utils.logMsg("PLEX",
+                                 "Not connected to a PMS.", -1)
                     return
                     
                 else:
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 7d7feca9..d77f45eb 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -406,6 +406,7 @@
     <string id="39059">Recently Added: Append show title to episode</string>
     <string id="39060">Recently Added: Append season- and episode-number SxxExx</string>
     <string id="39061">Would you like to download additional artwork from FanArtTV? Sync will be slower!</string>
+    <string id="39062">Sync when screensaver is deactivated</string>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Log-out Plex Home User </string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 1b6b57ba..03b85bfe 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -345,6 +345,7 @@
     <string id="39059">"Zuletzt hinzugefügt": Serien- an Episoden-Titel anfügen</string>
     <string id="39060">"Zuletzt hinzugefügt": Staffel und Episode anfügen, SxxExx</string>
     <string id="39061">Zusätzliche Bilder von FanArtTV herunterladen? Die Synchronisierung wird länger dauern!</string>
+    <string id="39062">Sync wenn Bildschirmschoner deaktiviert wird</string>
 
     <!-- Plex Entrypoint.py -->
     <string id="39200">Plex Home Benutzer abmelden: </string>
diff --git a/resources/lib/kodimonitor.py b/resources/lib/kodimonitor.py
index 355172d2..00cee329 100644
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@@ -146,12 +146,10 @@ 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")
-
+                xbmc.sleep(5000)
+                utils.window('plex_runLibScan', value="full")
 
         elif method == "Playlist.OnClear":
             pass
diff --git a/resources/settings.xml b/resources/settings.xml
index 20c87ae2..b4680aaf 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -54,6 +54,7 @@
 		<setting id="enableBackgroundSync" type="bool" label="39026" default="true" visible="true"/>
 		<setting id="saftyMargin" type="slider" label="39051" default="60" option="int" range="10,1,300" visible="eq(-1,true)"/>
 		<setting id="fullSyncInterval" type="number" label="39053" default="60" option="int" />
+		<setting id="dbSyncScreensaver" type="bool" label="39062" default="false" /><!--Sync when screensaver is deactivated-->
 
 		<setting type="lsep" label="30538" /><!-- Complete Re-Sync necessary -->
 		<setting id="FanartTV" label="30539" type="bool" default="false" /><!-- Download additional art from FanArtTV -->