From 3017dacdf1325b78c752205c7a987c229b29dc5f Mon Sep 17 00:00:00 2001 From: taotao54321 Date: Fri, 9 Mar 2012 18:50:26 +0000 Subject: [PATCH] SetMemoryDomain() called StartNewSearch(), so fixed it It broke LoadSearchFile() --- BizHawk.MultiClient/tools/RamSearch.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 99634bd721..f59c6fea5f 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -152,11 +152,11 @@ namespace BizHawk.MultiClient item.Text = str; { int z = x; - item.Click += (o, ev) => SetMemoryDomain(z); + item.Click += (o, ev) => SetMemoryDomainNew(z); } if (x == 0) { - SetMemoryDomain(x); + SetMemoryDomainNew(x); } memoryDomainsToolStripMenuItem.DropDownItems.Add(item); domainMenuItems.Add(item); @@ -172,6 +172,12 @@ namespace BizHawk.MultiClient SetMemoryDomainMenu(); //Calls Start New Search } + private void SetMemoryDomainNew(int pos) + { + SetMemoryDomain(pos); + StartNewSearch(); + } + private void SetMemoryDomain(int pos) { if (pos < Global.Emulator.MemoryDomains.Count) //Sanity check @@ -179,7 +185,6 @@ namespace BizHawk.MultiClient Domain = Global.Emulator.MemoryDomains[pos]; } SetPlatformAndMemoryDomainLabel(); - StartNewSearch(); addressFormatStr = "X" + GetNumDigits(Domain.Size - 1).ToString(); }