Fixed bug with TreeViewHandler running on different forms than MainForm.

Bumped version to 0.76.
ViRb3 · May 26, 2015 · 1bcb0e5 · 1bcb0e5
1 parent fa6272b
commit 1bcb0e5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 33 deletions.
diff --git a/dnEditor/Forms/MainForm.Designer.cs b/dnEditor/Forms/MainForm.Designer.cs
diff --git a/dnEditor/Forms/MainForm.resx b/dnEditor/Forms/MainForm.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAg
-        QwAAAk1TRnQBSQFMAgEBPgEAASgBAgEoAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        QwAAAk1TRnQBSQFMAgEBPgEAATABAgEwAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAQAAQECAAEBAQABCAYAAUAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -461,7 +461,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
-        0gAAAk1TRnQBSQFMAgEBqAEAATQBCwE0AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        0gAAAk1TRnQBSQFMAgEBqAEAATwBCwE8AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAbABAgIAAQEBAAEIBgABrBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
         AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
         AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz

diff --git a/dnEditor/Misc/NavigationHistory.cs b/dnEditor/Misc/NavigationHistory.cs
@@ -20,11 +20,8 @@ public class NavigationHistory
 
         public NavigationHistory(TreeViewHandler treeViewHandler)
         {
-            if (!(treeViewHandler.CurrentForm is MainForm))
-                throw new Exception("TreeViewHandler form is not MainForm!");
-
             _treeViewHandler = treeViewHandler;
-            _mainForm = (MainForm) _treeViewHandler.CurrentForm;
+            _mainForm = (_treeViewHandler.CurrentForm is MainForm) ? (MainForm)_treeViewHandler.CurrentForm : null;
         }
 
         public void AddPastHistory(object member)
@@ -78,7 +75,9 @@ private void UpdateState()
         {
             HasPast = _pastHistory.Count > 1;
             HasFuture = _futureHistory.Count > 0;
-            _mainForm.HandleToolStripItemsState();
+
+            if (_mainForm != null)
+                _mainForm.HandleToolStripItemsState();
         }
     }
 }