Merge pull request #966 from Neverbirth/TrackFixes

Track active document fixes.

Author: elsassph

External/Plugins/ProjectManager/PluginMain.cs

@@ -647,6 +647,9 @@ void SetProject(Project project, Boolean stealFocus, Boolean internalOpening)
                 RestoreProjectSession(project);
             }
 
+            // track active file
+            if (Settings.TrackActiveDocument) TreeSyncToCurrentFile();
+
             if (stealFocus)
             {
                 OpenPanel();
@@ -1629,8 +1632,19 @@ private void TreeSyncToCurrentFile()
             ITabbedDocument doc = PluginBase.MainForm.CurrentDocument;
             if (activeProject != null && doc != null && doc.IsEditable && !doc.IsUntitled)
             {
-                Tree.Select(doc.FileName);
-                Tree.SelectedNode.EnsureVisible();
+                string path = doc.FileName;
+
+                if (Tree.SelectedNode != null && Tree.SelectedNode.BackingPath == path)
+                    return;
+
+                Tree.Select(path);
+                if (Tree.SelectedNode.BackingPath == path)
+                {
+                    Tree.SelectedNode.EnsureVisible();
+                    Tree.PathToSelect = null;
+                }
+                else
+                    Tree.PathToSelect = path;
             }
         }