Fix Exporting and Renaming model systems before they are loaded. (#220)

JamesVaughan · web-flow · commit 585aa2a33438 · 2023-11-02T10:35:50.000-04:00
diff --git a/Code/XTMF/Editing/ProjectEditingSession.cs b/Code/XTMF/Editing/ProjectEditingSession.cs
@@ -324,7 +324,6 @@ public bool RenameModelSystem(ProjectModelSystem pms, string newName, ref string
         {
             lock (_EditingSessionsLock)
             {
-                
                 var index = Project.IndexOf(pms);
                 if (index < 0)
                 {
@@ -341,6 +340,7 @@ public bool RenameModelSystem(ProjectModelSystem pms, string newName, ref string
                         InvokeModelSystemNameChanged();
                     }
                     //In any case we need to save this change so everything updates accordingly
+                    Project.EnsureModelSystemLoaded(index);
                     Project.ModelSystemStructure[index].Name = newName;
                 }
                 else
@@ -422,6 +422,7 @@ public bool ExportModelSystem(int modelSystemIndex, string fileName, ref string
             lock (_EditingSessions)
             {
                 // If it is currently being edited, save that version
+                Project.EnsureModelSystemLoaded(modelSystemIndex);
                 var root = Project.ModelSystemStructure[modelSystemIndex];
                 var editingSession = _EditingSessions.FirstOrDefault(s => s.Session != null && s.Session.IsEditing(root));
                 if (editingSession.Session != null)

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,6 @@ public bool RenameModelSystem(ProjectModelSystem pms, string newName, ref string`
`324`	`324`	`{`
`325`	`325`	`lock (_EditingSessionsLock)`
`326`	`326`	`{`
`327`		`-`
`328`	`327`	`var index = Project.IndexOf(pms);`
`329`	`328`	`if (index < 0)`
`330`	`329`	`{`
`@@ -341,6 +340,7 @@ public bool RenameModelSystem(ProjectModelSystem pms, string newName, ref string`
`341`	`340`	`InvokeModelSystemNameChanged();`
`342`	`341`	`}`
`343`	`342`	`//In any case we need to save this change so everything updates accordingly`
	`343`	`+ Project.EnsureModelSystemLoaded(index);`
`344`	`344`	`Project.ModelSystemStructure[index].Name = newName;`
`345`	`345`	`}`
`346`	`346`	`else`
`@@ -422,6 +422,7 @@ public bool ExportModelSystem(int modelSystemIndex, string fileName, ref string`
`422`	`422`	`lock (_EditingSessions)`
`423`	`423`	`{`
`424`	`424`	`// If it is currently being edited, save that version`
	`425`	`+ Project.EnsureModelSystemLoaded(modelSystemIndex);`
`425`	`426`	`var root = Project.ModelSystemStructure[modelSystemIndex];`
`426`	`427`	`var editingSession = _EditingSessions.FirstOrDefault(s => s.Session != null && s.Session.IsEditing(root));`
`427`	`428`	`if (editingSession.Session != null)`