PR - Jira issues: [DYN-3890] | [DYN-3963] (#12015)

* Fixed crash as a result of frozen node + pin. -Also added `HasUnsavedChanges * PR fix.
DynamoDS · Sep 7, 2021 · bd5e1a6 · bd5e1a6
1 parent f19a7c0
commit bd5e1a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/src/DynamoCore/Core/UndoRedoRecorder.cs b/src/DynamoCore/Core/UndoRedoRecorder.cs
@@ -488,6 +488,7 @@ public ModelModificationUndoHelper(UndoRedoRecorder recorder, IEnumerable<ModelB
 
                 this.models = new List<ModelBase>(models);
                 existingConnectors = new Dictionary<Guid, XmlElement>();
+                existingPins = new Dictionary<Guid, XmlElement>();
                 remainingConnectors = new Dictionary<Guid, ConnectorModel>();
 
                 var allConnectors = new List<ConnectorModel>();

diff --git a/src/DynamoCore/Graph/Workspaces/UndoRedo.cs b/src/DynamoCore/Graph/Workspaces/UndoRedo.cs
@@ -282,6 +282,7 @@ internal void RecordAndDeleteModels(List<ModelBase> models)
                         var matchingConnector = Connectors.FirstOrDefault(c => c.GUID == connectorPinModel.ConnectorId);
                         if (matchingConnector is null) return;
                         matchingConnector.ConnectorPinModels.Remove(connectorPinModel);
+                        HasUnsavedChanges = true;
                     }
                 }
 

diff --git a/src/DynamoCoreWpf/ViewModels/Core/ConnectorPinViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ConnectorPinViewModel.cs
@@ -196,6 +196,7 @@ public Guid ConnectorGuid
         private void UnpinWireCommandExecute(object parameter)
         {
             OnRequestRemove(this, EventArgs.Empty);
+            WorkspaceViewModel.Model.HasUnsavedChanges = true;
         }
 
         private void InitializeCommands()

diff --git a/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ConnectorViewModel.cs
@@ -704,6 +704,7 @@ private void HideConnectorCommandExecute(object parameter)
             {
                 IsPartlyVisible = false;
             }
+            workspaceViewModel.Model.HasUnsavedChanges = true;
         }
         /// <summary>
         /// Selects nodes connected to this wire.
@@ -729,6 +730,7 @@ private void PinConnectorCommandExecute(object parameters)
             var connectorPinModel = new ConnectorPinModel(MousePosition.X, MousePosition.Y, Guid.NewGuid(), model.GUID);
             ConnectorModel.AddPin(connectorPinModel);
             workspaceViewModel.Model.RecordCreatedModel(connectorPinModel);
+            workspaceViewModel.Model.HasUnsavedChanges = true;
         }
 
         /// <summary>