[Core] Fixed disposing documents and settings

BAndysc · Mar 16, 2021 · 3fb30a2 · 3fb30a2
1 parent 85c5614
commit 3fb30a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/WoWDatabaseEditor/Managers/DocumentManager.cs b/WoWDatabaseEditor/Managers/DocumentManager.cs
@@ -93,6 +93,8 @@ public void OpenDocument(IDocument editor)
                             ActiveDocument = OpenedDocuments.Count > 0 ? OpenedDocuments[0] : null;
                         eventAggregator.GetEvent<DocumentClosedEvent>().Publish(editor);
                         editor.CloseCommand = origCommand;
+                        if (editor is IDisposable disposable)
+                            disposable.Dispose();
                     }
                 },
                 (context) => origCommand?.CanExecute(null) ?? true);

diff --git a/WoWDatabaseEditor/Services/ConfigurationService/ViewModels/ConfigurationPanelViewModel.cs b/WoWDatabaseEditor/Services/ConfigurationService/ViewModels/ConfigurationPanelViewModel.cs
@@ -73,7 +73,11 @@ private void SaveAll()
 
         public void Dispose()
         {
-
+            foreach (var tab in ContainerTabItems)
+            {
+                if (tab is IDisposable disposable)
+                    disposable.Dispose();
+            }
         }
 
         public string Title => "Settings";