ramwatch fix

This commit is contained in:
goyuken 2014-12-21 21:43:03 +00:00
parent d1580567dd
commit 78ea103114
2 changed files with 5 additions and 4 deletions

View File

@ -373,7 +373,8 @@ namespace BizHawk.Client.EmuHawk
{ {
var we = new WatchEditor 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); we.SetWatch(_watches.Domain, SelectedWatches, duplicate ? WatchEditor.Mode.Duplicate : WatchEditor.Mode.Edit);
@ -756,7 +757,8 @@ namespace BizHawk.Client.EmuHawk
{ {
var we = new WatchEditor var we = new WatchEditor
{ {
InitialLocation = this.ChildPointToScreen(WatchListView) InitialLocation = this.ChildPointToScreen(WatchListView),
Core = _core
}; };
we.SetWatch(_watches.Domain); we.SetWatch(_watches.Domain);
we.ShowHawkDialog(); we.ShowHawkDialog();

View File

@ -14,7 +14,7 @@ namespace BizHawk.Client.EmuHawk
public enum Mode { New, Duplicate, Edit }; public enum Mode { New, Duplicate, Edit };
private readonly List<Watch> _watchList = new List<Watch>(); private readonly List<Watch> _watchList = new List<Watch>();
private readonly IMemoryDomains Core; public IMemoryDomains Core { get; set; }
private Mode _mode = Mode.New; private Mode _mode = Mode.New;
private bool _loading = true; private bool _loading = true;
@ -28,7 +28,6 @@ namespace BizHawk.Client.EmuHawk
public WatchEditor() public WatchEditor()
{ {
Core = (IMemoryDomains)Global.Emulator;
_changedDisplayType = false; _changedDisplayType = false;
InitializeComponent(); InitializeComponent();
} }