From 6e23df6472248976733c24f643d96d178effec3e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 26 Mar 2014 00:34:43 +0000
Subject: [PATCH] Hex Editor - lots of fixes to Path and filename selection in
 OpenFile and SaveFile dialogs

---
 BizHawk.Client.Common/RecentFiles.cs          | 10 +++-
 .../tools/HexEditor/HexEditor.cs              | 50 ++++++++++++-------
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/BizHawk.Client.Common/RecentFiles.cs b/BizHawk.Client.Common/RecentFiles.cs
index b36873e8d7..f0530ba133 100644
--- a/BizHawk.Client.Common/RecentFiles.cs
+++ b/BizHawk.Client.Common/RecentFiles.cs
@@ -37,7 +37,7 @@ namespace BizHawk.Client.Common
 
 		public bool Empty
 		{
-			get { return recentlist.Count == 0; }
+			get { return !recentlist.Any(); }
 		}
 
 		public int Count
@@ -101,5 +101,13 @@ namespace BizHawk.Client.Common
 		{
 			AutoLoad ^= true;
 		}
+
+		public string MostRecent
+		{
+			get
+			{
+				return recentlist.Any() ? recentlist[0] : string.Empty;
+			}
+		}
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
index 2e80145ff3..74e9d59c44 100644
--- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
+++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
@@ -385,21 +385,23 @@ namespace BizHawk.Client.EmuHawk
 
 		private static string GetSaveFileFromUser()
 		{
-			var sfd = new SaveFileDialog();
-
-			if (!(Global.Emulator is NullEmulator))
+			var sfd = new SaveFileDialog
 			{
-				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
+				Filter = "Text (*.txt)|*.txt|All Files|*.*",
+				RestoreDirectory = true
+			};
+
+			if (Global.Emulator is NullEmulator)
+			{
+				sfd.FileName = "MemoryDump";
+				sfd.InitialDirectory = PathManager.GetBasePathAbsolute();
 			}
 			else
 			{
-				sfd.FileName = "MemoryDump";
+				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
+				sfd.InitialDirectory = Path.GetDirectoryName(PathManager.MakeAbsolutePath(Global.Config.RecentRoms.MostRecent, null));
 			}
 
-			sfd.InitialDirectory = PathManager.GetPlatformBase(Global.Emulator.SystemId);
-
-			sfd.Filter = "Text (*.txt)|*.txt|All Files|*.*";
-			sfd.RestoreDirectory = true;
 			var result = sfd.ShowHawkDialog();
 
 			return result == DialogResult.OK ? sfd.FileName : string.Empty;
@@ -883,20 +885,31 @@ namespace BizHawk.Client.EmuHawk
 
 		private string GetBinarySaveFileFromUser()
 		{
-			var sfd = new SaveFileDialog();
-
-			if (!(Global.Emulator is NullEmulator))
+			var sfd = new SaveFileDialog
 			{
-				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
+				Filter = GetSaveFileFilter(),
+				RestoreDirectory = true
+			};
+
+			if (Global.Emulator is NullEmulator)
+			{
+				sfd.FileName = "MemoryDump";
+				sfd.InitialDirectory = PathManager.GetBasePathAbsolute();
 			}
 			else
 			{
-				sfd.FileName = "MemoryDump";
+				if (_domain.Name == "File on Disk")
+				{
+					sfd.FileName = Path.GetFileName(Global.Config.RecentRoms.MostRecent);
+				}
+				else
+				{
+					sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
+				}
+
+				sfd.InitialDirectory = Path.GetDirectoryName(PathManager.MakeAbsolutePath(Global.Config.RecentRoms.MostRecent, null));
 			}
 
-			sfd.InitialDirectory = PathManager.GetPlatformBase(Global.Emulator.SystemId);
-			sfd.Filter = GetSaveFileFilter();
-			sfd.RestoreDirectory = true;
 			var result = sfd.ShowHawkDialog();
 
 			return result == DialogResult.OK ? sfd.FileName : string.Empty;
@@ -1286,7 +1299,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			var ofd = new OpenFileDialog
 			{
-				InitialDirectory = PathManager.GetPlatformBase(Global.Emulator.SystemId),
+				FileName = Path.GetFileNameWithoutExtension(Global.Config.RecentRoms.MostRecent) + ".tbl",
+				InitialDirectory = Path.GetDirectoryName(PathManager.MakeAbsolutePath(Global.Config.RecentRoms.MostRecent, null)),
 				Filter = "Text Table files (*.tbl)|*.tbl|All Files|*.*",
 				RestoreDirectory = false
 			};