Merge pull request #7371 from adobe/dangoor/7250-jslint-flashing

Only kick off project pref loading when the project changes

Author: bchintx

src/preferences/PreferencesManager.js

@@ -240,7 +240,7 @@ define(function (require, exports, module) {
         if (!filename || !projectDirectory) {
             return false;
         }
-        return FileUtils.getRelativeFilename(projectDirectory, filename) ? true : false;
+        return FileUtils.getRelativeFilename(projectDirectory, filename) !== undefined;
     }
 
     /**

src/project/ProjectManager.js

@@ -1142,10 +1142,14 @@ define(function (require, exports, module) {
                 var rootEntry = FileSystem.getDirectoryForPath(rootPath);
                 rootEntry.exists(function (err, exists) {
                     if (exists) {
-                        PreferencesManager._setCurrentEditingFile(rootPath);
                         var projectRootChanged = (!_projectRoot || !rootEntry) ||
                             _projectRoot.fullPath !== rootEntry.fullPath;
                         var i;
+                        
+                        if (projectRootChanged) {
+                            PreferencesManager._setCurrentEditingFile(rootPath);
+                        }
+
 
                         // Success!
                         var perfTimerName = PerfUtils.markStart("Load Project: " + rootPath);