From eaaaef8f1d1d28e4f4dd4af0ed13887fddc0c829 Mon Sep 17 00:00:00 2001 From: scepheo Date: Wed, 17 Dec 2014 20:04:25 +0000 Subject: [PATCH] RamSearch: Have Restart() handle settings loading so RAM Search actually works again. --- BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 13f0615ea6..0d7bb9a715 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -54,9 +54,9 @@ namespace BizHawk.Client.EmuHawk public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size ram search will support (as it will crash beyond this) [RequiredService] - public IMemoryDomains Core { get; private set; } + public IMemoryDomains Core { get; set; } [RequiredService] - public IEmulator Emu { get; private set; } + public IEmulator Emu { get; set; } public bool AskSaveChanges() { @@ -286,7 +286,8 @@ namespace BizHawk.Client.EmuHawk public void Restart() { - _settings.Domain = Core.MemoryDomains.MainMemory; + _settings = new RamSearchEngine.Settings(Core); + _searches = new RamSearchEngine(_settings, Core); MessageLabel.Text = "Search restarted"; DoDomainSizeCheck(); NewSearch();