diff --git a/BizHawk.MultiClient/tools/Watch/WatchEditor.cs b/BizHawk.MultiClient/tools/Watch/WatchEditor.cs index 2a7921526c..b4caedf5ae 100644 --- a/BizHawk.MultiClient/tools/Watch/WatchEditor.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchEditor.cs @@ -93,7 +93,7 @@ namespace BizHawk.MultiClient _watchList.AddRange(watches); } _mode = mode; - DoMemoryDomainDropdown(domain ?? Global.Emulator.MainMemory); + ToolHelpers.PopulateMemoryDomainDropdown(ref DomainDropDown, domain ?? Global.Emulator.MainMemory); SetTitle(); } @@ -114,22 +114,6 @@ namespace BizHawk.MultiClient } } - private void DoMemoryDomainDropdown(MemoryDomain startDomain) - { - DomainDropDown.Items.Clear(); - if (Global.Emulator.MemoryDomains.Count > 0) - { - foreach (MemoryDomain domain in Global.Emulator.MemoryDomains) - { - var result = DomainDropDown.Items.Add(domain.ToString()); - if (domain.Name == startDomain.Name) - { - DomainDropDown.SelectedIndex = result; - } - } - } - } - private void SetAddressBoxProperties() { if (!_loading) @@ -197,7 +181,6 @@ namespace BizHawk.MultiClient var domain = Global.Emulator.MemoryDomains.FirstOrDefault(d => d.Name == DomainDropDown.SelectedItem.ToString()) ?? Global.Emulator.MainMemory; BigEndianCheckBox.Checked = domain.Endian == Endian.Big; - } #region Events