update localsync

MediaBrowser · Oct 9, 2017 · f72e12e · f72e12e
1 parent 0981bd1
commit f72e12e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/sync/localsync.js b/sync/localsync.js
@@ -1,16 +1,20 @@
 define(['appSettings', 'connectionManager'], function (appSettings, connectionManager) {
     'use strict';
 
-    var syncPromise;
+    var isSyncing;
 
     return {
 
         sync: function (options) {
 
-            if (syncPromise) {
-                return syncPromise;
+            console.log('localSync.sync starting...');
+
+            if (isSyncing) {
+                return Promise.resolve();
             }
 
+            isSyncing = true;
+
             return new Promise(function (resolve, reject) {
 
                 require(['multiserversync'], function (MultiServerSync) {
@@ -19,14 +23,14 @@
 
                     options.cameraUploadServers = appSettings.cameraUploadServers();
 
-                    syncPromise = new MultiServerSync().sync(connectionManager, options).then(function () {
+                    new MultiServerSync().sync(connectionManager, options).then(function () {
 
-                        syncPromise = null;
+                        isSyncing = null;
                         resolve();
 
                     }, function () {
 
-                        syncPromise = null;
+                        isSyncing = null;
                         reject();
                     });
                 });

diff --git a/sync/multiserversync.js b/sync/multiserversync.js
@@ -31,6 +31,8 @@
 
     MultiServerSync.prototype.sync = function (connectionManager, options) {
 
+        console.log('MultiServerSync.sync starting...');
+
         return new Promise(function (resolve, reject) {
 
             var servers = connectionManager.getSavedServers();