Merge pull request #2812 from adobe/nj/issue-2809

Avoid adding duplicates to the list of welcome projects, and ...

Author: gruehle

src/project/ProjectManager.js

@@ -695,9 +695,12 @@ define(function (require, exports, module) {
      * or the one for the current build.
      */
     function isWelcomeProjectPath(path) {
+        var canonPath = FileUtils.canonicalizeFolderPath(path);
+        if (canonPath === _getWelcomeProjectPath()) {
+            return true;
+        }
         var welcomeProjects = _prefs.getValue("welcomeProjects") || [];
-        welcomeProjects.push(_getWelcomeProjectPath());
-        return welcomeProjects.indexOf(FileUtils.canonicalizeFolderPath(path)) !== -1;
+        return welcomeProjects.indexOf(canonPath) !== -1;
     }
 
     /**
@@ -755,6 +758,7 @@ define(function (require, exports, module) {
                     var rootEntry = fs.root;
                     var projectRootChanged = (!_projectRoot || !rootEntry) ||
                         _projectRoot.fullPath !== rootEntry.fullPath;
+                    var i;
 
                     // Success!
                     var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath),
@@ -1328,9 +1332,26 @@ define(function (require, exports, module) {
 
     // Init PreferenceStorage
     var defaults = {
-        projectPath:      _getWelcomeProjectPath()  /* initialize to brackets source */
+        projectPath:      _getWelcomeProjectPath()  /* initialize to welcome project */
     };
     _prefs = PreferencesManager.getPreferenceStorage(PREFERENCES_CLIENT_ID, defaults);
+        
+    if (!_prefs.getValue("welcomeProjectsFixed")) {
+        // One-time cleanup of duplicates in the welcome projects list--there used to be a bug where
+        // we would add lots of duplicate entries here.
+        var welcomeProjects = _prefs.getValue("welcomeProjects");
+        if (welcomeProjects) {
+            var newWelcomeProjects = [];
+            var i;
+            for (i = 0; i < welcomeProjects.length; i++) {
+                if (newWelcomeProjects.indexOf(welcomeProjects[i]) === -1) {
+                    newWelcomeProjects.push(welcomeProjects[i]);
+                }
+            }
+            _prefs.setValue("welcomeProjects", newWelcomeProjects);
+            _prefs.setValue("welcomeProjectsFixed", true);
+        }
+    }
 
     // Event Handlers
     $(FileViewController).on("documentSelectionFocusChange", _documentSelectionFocusChange);