Fix python editor crash inside custom node. (#14020)

reddyashish · web-flow · commit ce70b50bb384 · 2023-05-23T18:13:23.000-04:00
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1519,22 +1519,26 @@ internal bool CanCloseDockedNodeWindows(ObservableCollection<NodeViewModel> node
                 if (DockedNodeWindows.Contains(id))
                 {
                     var tabItem = SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == id);
-                    NodeModel nodeModel = GetDockedWindowNodeModel(tabItem.Uid);
 
-                    if (nodeModel is PythonNode pythonNode)
+                    if (tabItem != null)
                     {
-                        var editor = (tabItem.Content as Grid).ChildOfType<TextEditor>();
-                        if (editor != null && editor.IsModified)
+                        NodeModel nodeModel = GetDockedWindowNodeModel(tabItem.Uid);
+
+                        if (nodeModel is PythonNode pythonNode)
                         {
-                            pythonNode.OnWarnUserScript();
-                            tabItem.Focus();
-                            return false;
+                            var editor = (tabItem.Content as Grid).ChildOfType<TextEditor>();
+                            if (editor != null && editor.IsModified)
+                            {
+                                pythonNode.OnWarnUserScript();
+                                tabItem.Focus();
+                                return false;
+                            }
+                            pythonNode.Dispose();
                         }
-                        pythonNode.Dispose();
-                    }
 
-                    SideBarTabItems.Remove(tabItem);
-                    DockedNodeWindows.Remove(id);
+                        SideBarTabItems.Remove(tabItem);
+                        DockedNodeWindows.Remove(id);
+                    }
                 }
             }
             return true;
diff --git a/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs b/src/Libraries/PythonNodeModelsWpf/ScriptEditorWindow.xaml.cs
@@ -637,7 +637,11 @@ private void CloseWarningBarButton_OnClick(object sender, RoutedEventArgs e)
                 {
                     var dynamoView = Owner as DynamoView;
                     TabItem tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == NodeModel.GUID.ToString());
-                    dynamoView.CloseRightSideBarTab(tabItem);
+                    if (tabItem != null)
+                    {
+                        dynamoView.CloseRightSideBarTab(tabItem);
+                        dynamoViewModel.DockedNodeWindows.Remove(tabItem.Uid);
+                    }
                 }
             }
             catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,11 @@ private void CloseWarningBarButton_OnClick(object sender, RoutedEventArgs e)`
`637`	`637`	`{`
`638`	`638`	`var dynamoView = Owner as DynamoView;`
`639`	`639`	`TabItem tabItem = dynamoViewModel.SideBarTabItems.OfType<TabItem>().SingleOrDefault(n => n.Uid.ToString() == NodeModel.GUID.ToString());`
`640`		`- dynamoView.CloseRightSideBarTab(tabItem);`
	`640`	`+ if (tabItem != null)`
	`641`	`+ {`
	`642`	`+ dynamoView.CloseRightSideBarTab(tabItem);`
	`643`	`+ dynamoViewModel.DockedNodeWindows.Remove(tabItem.Uid);`
	`644`	`+ }`
`641`	`645`	`}`
`642`	`646`	`}`
`643`	`647`	`catch (Exception ex)`