From 53fa3b9adab3fa408e4fc4401a23499add3774d8 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 23 Oct 2014 01:32:27 +0000 Subject: [PATCH] Tastudio - fix crashing after using Export to Bk2, running out of memory on export though, a definite concern now --- .../movie/conversions/MovieConversionExtensions.cs | 7 +++++-- .../tools/TAStudio/TAStudio.MenuItems.cs | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index c68c2fbb0c..37cbd5b261 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -48,7 +48,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions return tas; } - public static Bk2Movie ToBk2(this IMovie old) + public static Bk2Movie ToBk2(this IMovie old, bool copy = false) { var newFilename = old.Filename + "." + Bk2Movie.Extension; var bk2 = new Bk2Movie(newFilename); @@ -59,7 +59,10 @@ namespace BizHawk.Client.Common.MovieConversionExtensions bk2.AppendFrame(input); } - old.Truncate(0); // Trying to minimize ram usage + if (!copy) + { + old.Truncate(0); // Trying to minimize ram usage + } bk2.HeaderEntries.Clear(); foreach(var kvp in old.HeaderEntries) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index df1978d9b7..80573caeb4 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -100,7 +100,7 @@ namespace BizHawk.Client.EmuHawk private void ToBk2MenuItem_Click(object sender, EventArgs e) { - var bk2 = CurrentTasMovie.ToBk2(); + var bk2 = CurrentTasMovie.ToBk2(true); bk2.Save(); MessageStatusLabel.Text = Path.GetFileName(bk2.Filename) + " created.";