From 0a0b58be7307e7c46ee00a740a0c2f05ad374736 Mon Sep 17 00:00:00 2001
From: jeffman <jefferbrecht@gmail.com>
Date: Thu, 26 Mar 2015 16:06:12 -0400
Subject: [PATCH] Fixed navigation bug

A group should only be auto-selected outside of selector events (i.e.,
the back button or clicking a reference)
---
 ScriptTool/ScriptToolGui/MainForm.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ScriptTool/ScriptToolGui/MainForm.cs b/ScriptTool/ScriptToolGui/MainForm.cs
index dbe1f21..bffe5bf 100644
--- a/ScriptTool/ScriptToolGui/MainForm.cs
+++ b/ScriptTool/ScriptToolGui/MainForm.cs
@@ -305,8 +305,6 @@ namespace ScriptToolGui
                 previousNavigationState = new MatchedGroupNavigationEntry(group);
             }
 
-            SelectGroup(group);
-
             PopulateCodeList();
             PopulateReferenceList();
 
@@ -347,7 +345,7 @@ namespace ScriptToolGui
             return match;
         }
 
-        private void NavigateTo(Game game, string label)
+        private MatchedGroup NavigateTo(Game game, string label)
         {
             foreach (var eachGame in validGames)
             {
@@ -387,12 +385,12 @@ namespace ScriptToolGui
                 }
             }
 
-            SelectGroup(match);
-
             PopulateCodeList();
             PopulateReferenceList();
 
             previewButton_Click(null, null);
+
+            return match;
         }
 
         private void PushPreviousNavigationState()
@@ -542,7 +540,9 @@ namespace ScriptToolGui
             SaveCurrentState(true);
 
             if (groupSelector.SelectedIndex == -1)
+            {
                 NavigateTo(null);
+            }
             else
             {
                 PushPreviousNavigationState();
@@ -572,7 +572,8 @@ namespace ScriptToolGui
                     SaveCurrentState(true);
 
                     PushPreviousNavigationState();
-                    NavigateTo(game, label);
+                    var group = NavigateTo(game, label);
+                    SelectGroup(group);
                 }
             }
         }
@@ -590,11 +591,13 @@ namespace ScriptToolGui
             {
                 var matchedEntry = (MatchedGroupNavigationEntry)nav;
                 NavigateTo(matchedEntry.Group);
+                SelectGroup(matchedEntry.Group);
             }
             else if (nav.Type == NavigationType.Reference)
             {
                 var referenceEntry = (ReferenceNavigationEntry)nav;
-                NavigateTo(referenceEntry.Game, referenceEntry.Label);
+                var group = NavigateTo(referenceEntry.Game, referenceEntry.Label);
+                SelectGroup(group);
             }
         }