From df2dd2df9bb777a8f682ade584ff842348b29b24 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 5 Sep 2015 20:53:02 -0400
Subject: [PATCH] Cheats - fix up open and save file dialog file/directory
 logic

---
 BizHawk.Client.EmuHawk/tools/ToolHelpers.cs | 35 ++++++++++++---------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
index 681cc179b3..5cf80e10da 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolHelpers.cs
@@ -108,15 +108,15 @@ namespace BizHawk.Client.EmuHawk
 
 		public static FileInfo GetCheatFileFromUser(string currentFile)
 		{
-			var ofd = new OpenFileDialog();
-			if (!string.IsNullOrWhiteSpace(currentFile))
+			var ofd = new OpenFileDialog
 			{
-				ofd.FileName = Path.GetFileNameWithoutExtension(currentFile);
-			}
-
-			ofd.InitialDirectory = PathManager.GetCheatsPath(Global.Game);
-			ofd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
-			ofd.RestoreDirectory = true;
+				FileName = !string.IsNullOrWhiteSpace(currentFile)
+					? Path.GetFileNameWithoutExtension(currentFile)
+					: PathManager.FilesystemSafeName(Global.Game),
+				InitialDirectory = PathManager.GetCheatsPath(Global.Game),
+				Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*",
+				RestoreDirectory = true
+			};
 
 			var result = ofd.ShowHawkDialog();
 			if (result != DialogResult.OK)
@@ -129,15 +129,22 @@ namespace BizHawk.Client.EmuHawk
 
 		public static FileInfo GetCheatSaveFileFromUser(string currentFile)
 		{
-			var sfd = new SaveFileDialog();
-			if (!string.IsNullOrWhiteSpace(currentFile))
+			var cheatsPath = PathManager.GetCheatsPath(Global.Game);
+			if (!Directory.Exists(cheatsPath))
 			{
-				sfd.FileName = Path.GetFileNameWithoutExtension(currentFile);
+				Directory.CreateDirectory(cheatsPath);
 			}
 
-			sfd.InitialDirectory = PathManager.GetCheatsPath(Global.Game);
-			sfd.Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*";
-			sfd.RestoreDirectory = true;
+			var sfd = new SaveFileDialog
+			{
+				Filter = "Cheat Files (*.cht)|*.cht|All Files|*.*",
+				RestoreDirectory = true,
+				InitialDirectory = cheatsPath,
+				FileName = !string.IsNullOrWhiteSpace(currentFile)
+					? Path.GetFileNameWithoutExtension(currentFile)
+					: PathManager.FilesystemSafeName(Global.Game)
+			};
+
 			var result = sfd.ShowHawkDialog();
 			if (result != DialogResult.OK)
 			{