diff --git a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs index cecd8f7439..145e8ed132 100644 --- a/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs +++ b/src/BizHawk.Client.Common/movie/MovieConversionExtensions.cs @@ -139,7 +139,6 @@ namespace BizHawk.Client.Common tas.TasStateManager.Settings = old.TasStateManager.Settings; - tas.Save(); tas.ClearChanges(); return tas; } @@ -181,7 +180,6 @@ namespace BizHawk.Client.Common tas.TasStateManager.Settings = old.TasStateManager.Settings; - tas.Save(); tas.ClearChanges(); return tas; } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index e257ba0905..e0ebb6482e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -43,7 +43,12 @@ namespace BizHawk.Client.EmuHawk Emulator.Frame, StatableEmulator.CloneSavestate()); MainForm.PauseEmulator(); - LoadFile(new FileInfo(newProject.Filename)); + // Create a new file, unless the original movie was "default" (i.e. never saved) + if (!CurrentTasMovie.Filename.Equals(DefaultTasProjName())) + newProject.Save(); + else + newProject.Filename = DefaultTasProjName(); // ask for name when user saves + LoadMovie(newProject, 0); } } @@ -63,7 +68,12 @@ namespace BizHawk.Client.EmuHawk var newProject = CurrentTasMovie.ConvertToSaveRamAnchoredMovie( SaveRamEmulator.CloneSaveRam()); MainForm.PauseEmulator(); - LoadFile(new FileInfo(newProject.Filename)); + // Create a new file, unless the original movie was "default" (i.e. never saved) + if (!CurrentTasMovie.Filename.Equals(DefaultTasProjName())) + newProject.Save(); + else + newProject.Filename = DefaultTasProjName(); // ask for name when user saves + LoadMovie(newProject, 0); } else {