Workaround for when clicking a button outside TreeView while renaming

Author: joaoribe

src/SQLScriptsExplorer.Addin/Controls/FileExplorerTreeView.xaml.cs

@@ -89,7 +89,10 @@ private void TreeViewMain_PreviewMouseLeftButtonDown(object sender, MouseButtonE
                 currentTreeViewItem.DataContext as TreeNode : null;
 
             // In case changing focus to a different node while renaming file
-            ApplyRenaming();
+            if (currentTreeNode != null && isEditMode && currentTreeNode.Id != renamingNodeId)
+            {
+                txtRename_LostFocus(null, null);
+            }
         }
 
         private void TreeViewMain_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
@@ -333,12 +336,15 @@ private void txtRename_LostFocus(object sender, RoutedEventArgs e)
                     {
                         if (string.IsNullOrWhiteSpace(txtRename.Text))
                         {
-                            MessageBox.Show("Please enter a file name.");
-                            txtRename.Text = lblRename.Text = renamingNodeFileName;
-                            return;
+                            // TODO: Workaround for when clicking a button outside TreeView
+                            if (currentTreeViewItem != null && !currentTreeViewItem.DataContext.ToString().Equals("{DisconnectedItem}"))
+                            {
+                                MessageBox.Show("Please enter a file name.");
+                                txtRename.Text = lblRename.Text = renamingNodeFileName;
+                                return;
+                            }
                         }
-
-                        if (currentTreeViewItem != null && renamingNodeFileName != txtRename.Text)
+                        else if (currentTreeViewItem != null && renamingNodeFileName != txtRename.Text)
                         {
                             var renamingTreeNode = DataSourceDictionary[renamingNodeId];
 
@@ -403,13 +409,5 @@ private void txtRename_LostFocus(object sender, RoutedEventArgs e)
                 MessageBox.Show(ex.Message);
             }
         }
-
-        private void ApplyRenaming()
-        {
-            if (currentTreeNode != null && isEditMode && currentTreeNode.Id != renamingNodeId)
-            {
-                txtRename_LostFocus(null, null);
-            }
-        }
     }
 }