Clear lists of variables on close to prevent loading on closed windows

awulkiew · Nov 20, 2023 · d092b17 · d092b17
1 parent 48fba16
commit d092b17
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 0 deletions.
diff --git a/solution/GraphicalDebugging/GeometryWatch.cs b/solution/GraphicalDebugging/GeometryWatch.cs
@@ -36,5 +36,11 @@ public GeometryWatch() : base(null)
             // the object returned by the Content property.
             this.Content = new GeometryWatchControl();
         }
+
+        protected override void OnClose()
+        {
+            (this.Content as GeometryWatchControl).OnClose();
+            base.OnClose();
+        }
     }
 }
diff --git a/solution/GraphicalDebugging/GeometryWatchControl.xaml.cs b/solution/GraphicalDebugging/GeometryWatchControl.xaml.cs
@@ -563,5 +563,10 @@ private void dataGridContextMenuDisable_Click(object sender, RoutedEventArgs e)
             Util.EnableDataGridItems(dataGrid, Geometries,
                 (GeometryItem geometry) => geometry.IsEnabled = false);
         }
+
+        public void OnClose()
+        {
+            Geometries.Clear();
+        }
     }
 }
diff --git a/solution/GraphicalDebugging/GraphicalWatch.cs b/solution/GraphicalDebugging/GraphicalWatch.cs
@@ -36,5 +36,11 @@ public GraphicalWatch() : base(null)
             // the object returned by the Content property.
             this.Content = new GraphicalWatchControl();
         }
+
+        protected override void OnClose()
+        {
+            (this.Content as GraphicalWatchControl).OnClose();
+            base.OnClose();
+        }
     }
 }
diff --git a/solution/GraphicalDebugging/GraphicalWatchControl.xaml.cs b/solution/GraphicalDebugging/GraphicalWatchControl.xaml.cs
@@ -280,5 +280,10 @@ private void dataGridContextMenuDelete_Click(object sender, RoutedEventArgs e)
                 (GraphicalItem variable) => { },
                 () => { });
         }
+
+        public void OnClose()
+        {
+            Variables.Clear();
+        }
     }
 }
diff --git a/solution/GraphicalDebugging/PlotWatch.cs b/solution/GraphicalDebugging/PlotWatch.cs
@@ -36,5 +36,11 @@ public PlotWatch() : base(null)
             // the object returned by the Content property.
             this.Content = new PlotWatchControl();
         }
+
+        protected override void OnClose()
+        {
+            (this.Content as PlotWatchControl).OnClose();
+            base.OnClose();
+        }
     }
 }
diff --git a/solution/GraphicalDebugging/PlotWatchControl.xaml.cs b/solution/GraphicalDebugging/PlotWatchControl.xaml.cs
@@ -571,5 +571,10 @@ private void dataGridContextMenuDisable_Click(object sender, RoutedEventArgs e)
             Util.EnableDataGridItems(dataGrid, Plots,
                 (PlotItem plot) => plot.IsEnabled = false);
         }
+
+        public void OnClose()
+        {
+            Plots.Clear();
+        }
     }
 }