From e8103a1c53b5f0ae5e956ad744466452cb44cffe Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 8 Mar 2018 22:57:50 +0300 Subject: [PATCH] tastudio macros: don't die from colons in paths when saving to file disable macros menu items when there's no selection --- BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs | 2 +- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index 5044b98271..d20fea3c50 100644 --- a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -295,7 +295,7 @@ namespace BizHawk.Client.EmuHawk { return PathManager.MakeAbsolutePath(Path.Combine( Global.Config.PathEntries["Global", "Macros"].Path, - Global.Game.Name), null); + PathManager.FilesystemSafeName(Global.Game)), null); } #endregion diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index cb38859858..7deafb2f95 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -25,6 +25,10 @@ namespace BizHawk.Client.EmuHawk SaveTASMenuItem.Enabled = !string.IsNullOrWhiteSpace(CurrentTasMovie.Filename) && (CurrentTasMovie.Filename != DefaultTasProjName()); + + saveSelectionToMacroToolStripMenuItem.Enabled = + placeMacroAtSelectionToolStripMenuItem.Enabled = + TasView.AnyRowsSelected; } private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)