Debugger: Memory viewer - Fixed issues with search window caused by r…

…ecent memory leak-related fixes
SourMesen · Nov 12, 2024 · da6ff36 · da6ff36
1 parent 7b84a75
commit da6ff36
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/UI/Debugger/ViewModels/MemoryToolsViewModel.cs b/UI/Debugger/ViewModels/MemoryToolsViewModel.cs
@@ -52,7 +52,7 @@ public MemoryToolsViewModel(HexEditor editor)
 		{
 			Config = ConfigManager.Config.Debug.HexEditor.Clone();
 
-			Search = new(this);
+			Search = AddDisposable(new MemoryViewerFindViewModel(this));
 			_editor = editor;
 
 			Options = AddDisposable(new MemoryToolsDisplayOptionsViewModel(this));

diff --git a/UI/Debugger/ViewModels/MemoryViewerFindViewModel.cs b/UI/Debugger/ViewModels/MemoryViewerFindViewModel.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Threading;
 using Mesen.Config;
 using Mesen.Debugger.Utilities;
 using Mesen.ViewModels;
@@ -52,7 +53,10 @@ public MemoryViewerFindViewModel(MemoryToolsViewModel memToolsModel)
 
 		AddDisposable(this.WhenAnyValue(x => x.SearchString).Subscribe(x => {
 			if(SearchString.Contains(Environment.NewLine)) {
-				SearchString = SearchString.Replace(Environment.NewLine, " ");
+				//Run asynchronously to allow the textbox to update its content correctly
+				Dispatcher.UIThread.Post(() => {
+					SearchString = SearchString.Replace(Environment.NewLine, " ");
+				});
 			}
 		}));
 

diff --git a/UI/Debugger/Windows/MemoryViewerFindWindow.axaml.cs b/UI/Debugger/Windows/MemoryViewerFindWindow.axaml.cs
@@ -44,6 +44,14 @@ private void InitializeComponent()
 			AvaloniaXamlLoader.Load(this);
 		}
 
+		protected override void OnClosed(EventArgs e)
+		{
+			//Prevent MesenWindow logic from disposing the model
+			DataContext = null;
+
+			base.OnClosed(e);
+		}
+
 		private void OnPreviewKeyDown(object? sender, KeyEventArgs e)
 		{
 			if(e.Key == Key.Enter) {