Removing the selected node on delete

StanleyGoldman · StanleyGoldman · commit 77df3fa8e2a6 · 2017-08-28T10:49:33.000-04:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
@@ -61,6 +61,7 @@ public override void OnDisable()
         {
             base.OnDisable();
             DetachHandlers(Repository);
+            selectedNode = null;
         }
 
         public override void OnRepositoryChanged(IRepository oldRepository)
@@ -461,7 +462,7 @@ private void OnButtonBarGUI()
             {
                 // Delete button
                 // If the current branch is selected, then do not enable the Delete button
-                var disableDelete = activeBranchNode == selectedNode;
+                var disableDelete = selectedNode == null || activeBranchNode == selectedNode;
                 EditorGUI.BeginDisabledGroup(disableDelete);
                 {
                     if (GUILayout.Button(DeleteBranchButton, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public override void OnDisable()`
`61`	`61`	`{`
`62`	`62`	`base.OnDisable();`
`63`	`63`	`DetachHandlers(Repository);`
	`64`	`+ selectedNode = null;`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`public override void OnRepositoryChanged(IRepository oldRepository)`
`@@ -461,7 +462,7 @@ private void OnButtonBarGUI()`
`461`	`462`	`{`
`462`	`463`	`// Delete button`
`463`	`464`	`// If the current branch is selected, then do not enable the Delete button`
`464`		`- var disableDelete = activeBranchNode == selectedNode;`
	`465`	`+ var disableDelete = selectedNode == null \|\| activeBranchNode == selectedNode;`
`465`	`466`	`EditorGUI.BeginDisabledGroup(disableDelete);`
`466`	`467`	`{`
`467`	`468`	`if (GUILayout.Button(DeleteBranchButton, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))`