diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 4f7d52868a..7906430751 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -1198,17 +1198,28 @@ namespace BizHawk.Client.EmuHawk private void LoadTableFileMenuItem_Click(object sender, EventArgs e) { + string romName; + string intialDirectory; + if (Global.Config.RecentRoms.MostRecent.Contains('|')) + { + romName = Global.Config.RecentRoms.MostRecent.Split('|').Last(); + intialDirectory = Global.Config.RecentRoms.MostRecent.Split('|').First(); + } + else + { + romName = Global.Config.RecentRoms.MostRecent; + intialDirectory = Path.GetDirectoryName(PathManager.MakeAbsolutePath(romName, null)); + } + var ofd = new OpenFileDialog { - FileName = Path.GetFileNameWithoutExtension(Global.Config.RecentRoms.MostRecent) + ".tbl", - InitialDirectory = Path.GetDirectoryName(PathManager.MakeAbsolutePath(Global.Config.RecentRoms.MostRecent, null)), + FileName = Path.GetFileNameWithoutExtension(romName) + ".tbl", + InitialDirectory = intialDirectory, Filter = "Text Table files (*.tbl)|*.tbl|All Files|*.*", RestoreDirectory = false }; - GlobalWin.Sound.StopSound(); - var result = ofd.ShowDialog(); - GlobalWin.Sound.StartSound(); + var result = ofd.ShowHawkDialog(); if (result == DialogResult.OK) {