diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index c7a2e4deea..5945d219c6 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -260,6 +260,13 @@ namespace BizHawk.MultiClient return null; } + public void SetDomain(MemoryDomain domain) + { + Domain = domain; + int? theDomain = GetDomainInt(Domain.Name); + SetMemoryDomain(theDomain ?? 0); + } + public void Restart() { if (!this.IsHandleCreated || this.IsDisposed) return; diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index 5e63f9592f..8d3af9934c 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -2604,6 +2604,7 @@ namespace BizHawk.MultiClient if (indexes.Count > 0) { Global.MainForm.LoadHexEditor(); + Global.MainForm.HexEditor1.SetDomain(Searches[indexes[0]].Domain); Global.MainForm.HexEditor1.GoToAddress(Searches[indexes[0]].Address); } } diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index ba32700147..35c1008c7a 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -1174,6 +1174,7 @@ namespace BizHawk.MultiClient if (indexes.Count > 0) { Global.MainForm.LoadHexEditor(); + Global.MainForm.HexEditor1.SetDomain(Watches[indexes[0]].Domain); Global.MainForm.HexEditor1.GoToAddress(Watches[indexes[0]].Address); } }