diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index ee3a50aa81..c0bb80208c 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk }; var result = ofd.ShowHawkDialog(); - if (result == DialogResult.OK) + if (result.IsOk()) { if (ofd.FileName.EndsWith(TasMovie.Extension)) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index ef7ae7cfe9..f226f8e5d7 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -834,29 +834,21 @@ namespace BizHawk.Client.EmuHawk MainForm.TakeBackControl(); Config.MovieEndAction = _originalEndAction; MainForm.SetMainformMovieInfo(); - - // Do not keep TAStudio's disk save states. - // if (Directory.Exists(statesPath)) Directory.Delete(statesPath, true); - // TODO - do we need to dispose something here instead? } - /// - /// Used when starting a new project - /// - private static string DefaultTasProjName() + // Used when starting a new project + private string DefaultTasProjName() { return Path.Combine( - Global.Config.PathEntries.MovieAbsolutePath(), + Config.PathEntries.MovieAbsolutePath(), $"{TasMovie.DefaultProjectName}.{TasMovie.Extension}"); } - /// - /// Used for things like SaveFile dialogs to suggest a name to the user - /// - private static string SuggestedTasProjName() + // Used for things like SaveFile dialogs to suggest a name to the user + private string SuggestedTasProjName() { return Path.Combine( - Global.Config.PathEntries.MovieAbsolutePath(), + Config.PathEntries.MovieAbsolutePath(), $"{Global.Game.FilesystemSafeName()}.{TasMovie.Extension}"); }