From 78ea1031146574d2211eafb4a4eae31433e5b62c Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 21 Dec 2014 21:43:03 +0000 Subject: [PATCH] ramwatch fix --- BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs | 6 ++++-- BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index c11c375328..a527d58f51 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -373,7 +373,8 @@ namespace BizHawk.Client.EmuHawk { var we = new WatchEditor { - InitialLocation = this.ChildPointToScreen(WatchListView) + InitialLocation = this.ChildPointToScreen(WatchListView), + Core = _core }; we.SetWatch(_watches.Domain, SelectedWatches, duplicate ? WatchEditor.Mode.Duplicate : WatchEditor.Mode.Edit); @@ -756,7 +757,8 @@ namespace BizHawk.Client.EmuHawk { var we = new WatchEditor { - InitialLocation = this.ChildPointToScreen(WatchListView) + InitialLocation = this.ChildPointToScreen(WatchListView), + Core = _core }; we.SetWatch(_watches.Domain); we.ShowHawkDialog(); diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs index f072f13a1f..6f6c887d63 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs @@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk public enum Mode { New, Duplicate, Edit }; private readonly List _watchList = new List(); - private readonly IMemoryDomains Core; + public IMemoryDomains Core { get; set; } private Mode _mode = Mode.New; private bool _loading = true; @@ -28,7 +28,6 @@ namespace BizHawk.Client.EmuHawk public WatchEditor() { - Core = (IMemoryDomains)Global.Emulator; _changedDisplayType = false; InitializeComponent(); }