Call the callback if we can't parse the local Drive to import it

8 years ago · 16e5788011
parent 36a2eab3c3
commit 16e5788011
1 changed files with 9 additions and 1 deletions
--- a/www/common/mergeDrive.js
+++ b/www/common/mergeDrive.js
@ -138,7 +138,15 @@ define([
        var todo = function (err, doc) {
            if (err) { console.error("Cannot migrate recent pads", err); return; }
            var parsed;
-            try { parsed = JSON.parse(doc); } catch (e) { console.error("Cannot parsed recent pads", e); return; }
+            if (!doc) {
+                if (typeof(cb) === "function") { cb(); }
+                return;
+            }
+            try { parsed = JSON.parse(doc); } catch (e) {
+                if (typeof(cb) === "function") { cb(); }
+                console.error("Cannot parsed recent pads", e);
+                return;
+            }
            if (parsed) {
                //merge(proxy, parsed, true);
                var oldFo = FO.init(parsed.drive, {