Merge branch 'develop' of https://github.com/MediaBrowser/plugin.video.emby into develop

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
         name="Emby" 
-        version="2.3.21"
+        version="2.3.22"
         provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.19.0"/>

resources/language/English/strings.xml

@@ -352,5 +352,6 @@
     <string id="33092">Create a backup</string>
     <string id="33093">Backup folder</string>
     <string id="33094">Select content type to repair</string>
+    <string id="33095">Failed to retrieve latest updates using fast sync, using full sync.</string>
 
 </strings>

resources/lib/librarysync.py

@@ -136,9 +136,9 @@ class LibrarySync(threading.Thread):
         if settings('enableMusic') != "true":
             params['filter'] = "music"
         url = "{server}/emby/Emby.Kodi.SyncQueue/{UserId}/GetItems?format=json"
-        result = self.doUtils(url, parameters=params)
 
         try:
+            result = self.doUtils(url, parameters=params)
             processlist = {
 
                 'added': result['ItemsAdded'],
@@ -149,13 +149,13 @@ class LibrarySync(threading.Thread):
 
         except (KeyError, TypeError):
             log.error("Failed to retrieve latest updates using fast sync.")
+            xbmcgui.Dialog().ok(lang(29999), lang(33095))
             return False
 
         else:
             log.info("Fast sync changes: %s" % result)
             for action in processlist:
                 self.triage_items(action, processlist[action])
-
             return True
 
     def saveLastSync(self):