From 9b7774dfc0b2ab7a4f42d84698038a522cc419f4 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Wed, 23 Mar 2016 10:30:49 +0100
Subject: [PATCH] Hold off sync if user chooses to go into settings

During initial setup. Restart Kodi required
---
 resources/language/English/strings.xml | 3 +--
 resources/language/German/strings.xml  | 2 +-
 resources/lib/initialsetup.py          | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 1950c9f1..6a47b4e6 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -357,8 +357,7 @@
     <string id="39014">Please sign in to plex.tv.</string>
     <string id="39015">Problems connecting to server. Pick another server?</string>
     <string id="39016">Disable Plex music library?</string>
-    <string id="39017">Would you now like to go to the plugin's settings?
-    (This is hopefully unneccessary ;-))</string>
+    <string id="39017">Would you now like to go to the plugin's settings to fine-tune PKC? You will need to RESTART Kodi!</string>
 
     <string id="39018">[COLOR yellow]Repair local database (force update all content)[/COLOR]</string>
     <string id="39019">[COLOR yellow]Perform local database reset (full resync)[/COLOR]</string>
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index f643c030..143ac398 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -294,7 +294,7 @@
     <string id="39014">Bitte loggen Sie sich in plex.tv ein.</string>
     <string id="39015">Beim Verbinden mit dem Server sind Probleme aufgetreten. Mit einem anderen Server versuchen?</string>
     <string id="39016">Plex Musik Bibliotheken deaktivieren?</string>
-    <string id="39017">Möchten Sie nun die Einstellungen des Plugins öffnen? (Was hoffentlich unnötig ist ;-))"</string>
+    <string id="39017">Möchten Sie nun die Einstellungen des Plugins öffnen? Kodi muss anschliessend neu gestartet werden!</string>
 
     <string id="39018">[COLOR yellow]Lokale Datenbank reparieren (allen Inhalt aktualisieren)[/COLOR]</string>
     <string id="39019">[COLOR yellow]Lokale Datenbank zurücksetzen (kompletter Resync nötig)[/COLOR]</string>
diff --git a/resources/lib/initialsetup.py b/resources/lib/initialsetup.py
index 1a332fe0..7d1557a6 100644
--- a/resources/lib/initialsetup.py
+++ b/resources/lib/initialsetup.py
@@ -261,8 +261,6 @@ class InitialSetup():
                 dialog.ok(heading=self.addonName,
                           line1=string(39044))
                 goToSettings = True
-                # Don't start anything because we need these paths first!
-                utils.window('emby_serverStatus', value="Stop")
 
             # Go to network credentials?
             if dialog.yesno(heading=self.addonName,
@@ -280,8 +278,9 @@ class InitialSetup():
             xbmc.executebuiltin(
                 'Addon.OpenSettings(plugin.video.plexkodiconnect)')
         else:
-            # Open Settings page now?
+            # Open Settings page now? You will need to restart!
             if dialog.yesno(heading=self.addonName,
                             line1=string(39017)):
+                utils.window('emby_serverStatus', value="Stop")
                 xbmc.executebuiltin(
                     'Addon.OpenSettings(plugin.video.plexkodiconnect)')