Merge pull request #6653 from busykai/fix-6647

dangoor · dangoor · commit ce04d9796bf6 · 2014-01-27T05:05:32.000-08:00
Fix #6647
diff --git a/src/preferences/PreferencesManager.js b/src/preferences/PreferencesManager.js
@@ -230,24 +230,28 @@ define(function (require, exports, module) {
     var userScope = preferencesManager.addScope("user", new PreferencesBase.FileStorage(userPrefFile, true));
     
     // Set up the .brackets.json file handling
-    preferencesManager.addPathScopes(".brackets.json", {
-        before: "user",
-        checkExists: function (filename) {
-            var result = new $.Deferred(),
-                file = FileSystem.getFileForPath(filename);
-            file.exists(function (err, doesExist) {
-                result.resolve(doesExist);
-            });
-            return result.promise();
-        },
-        getScopeForFile: function (filename) {
-            return new PreferencesBase.Scope(new PreferencesBase.FileStorage(filename));
-        }
-    });
-    
-    // Session Scope is for storing prefs in memory only but with the highest precedence.
-    preferencesManager.addScope("session", new PreferencesBase.MemoryStorage());
-    
+    userScope
+        .done(function () {
+            preferencesManager.addPathScopes(".brackets.json", {
+                before: "user",
+                checkExists: function (filename) {
+                    var result = new $.Deferred(),
+                        file = FileSystem.getFileForPath(filename);
+                    file.exists(function (err, doesExist) {
+                        result.resolve(doesExist);
+                    });
+                    return result.promise();
+                },
+                getScopeForFile: function (filename) {
+                    return new PreferencesBase.Scope(new PreferencesBase.FileStorage(filename));
+                }
+            })
+                .done(function () {
+                    // Session Scope is for storing prefs in memory only but with the highest precedence.
+                    preferencesManager.addScope("session", new PreferencesBase.MemoryStorage());
+                });
+        });
+        
     /**
      * Creates an extension-specific preferences manager using the prefix given.
      * A `.` character will be appended to the prefix. So, a preference named `foo`
