From 32b788b3523d0b4ba0c3e8d3167676b28c58752e Mon Sep 17 00:00:00 2001
From: scepheo <scepheo@gmail.com>
Date: Tue, 24 Feb 2015 10:18:20 +0000
Subject: [PATCH] Hex Editor and new RAM Watch now default to memory domain
 byte size.

---
 .../tools/HexEditor/HexEditor.cs                   |  1 +
 BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 7906430751..abc7b038d6 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -444,6 +444,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void HexEditor_Load(object sender, EventArgs e)
 		{
+			DataSize = _domain.ByteSize;
 			SetDataSize(DataSize);
 
 			if (RecentTables.AutoLoad)
diff --git a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
index ac3b7292e9..9a0849aeae 100644
--- a/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/Watch/WatchEditor.cs
@@ -46,7 +46,19 @@ namespace BizHawk.Client.EmuHawk
 			{
 				default:
 				case Mode.New:
-					SizeDropDown.SelectedItem = SizeDropDown.Items[0];
+					switch (MemoryDomains.First().ByteSize)
+					{
+						default:
+						case 1:
+							SizeDropDown.SelectedItem = SizeDropDown.Items[0];
+							break;
+						case 2:
+							SizeDropDown.SelectedItem = SizeDropDown.Items[1];
+							break;
+						case 4:
+							SizeDropDown.SelectedItem = SizeDropDown.Items[2];
+							break;
+					}
 					break;
 				case Mode.Duplicate:
 				case Mode.Edit: