From ad6c614665365bebeede4634e2fbec25347e9aa8 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 16 Jul 2014 23:22:30 +0000
Subject: [PATCH] Fix Bkm to Bk2 conversion

---
 BizHawk.Client.Common/movie/MovieService.cs                   | 4 +++-
 .../movie/conversions/MovieConversionExtensions.cs            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.Common/movie/MovieService.cs b/BizHawk.Client.Common/movie/MovieService.cs
index 19da45288f..16aa964003 100644
--- a/BizHawk.Client.Common/movie/MovieService.cs
+++ b/BizHawk.Client.Common/movie/MovieService.cs
@@ -18,7 +18,9 @@ namespace BizHawk.Client.Common
 
 			if (Path.GetExtension(path).EndsWith("bkm"))
 			{
-				return new BkmMovie(path).ToBk2();
+				var bkm = new BkmMovie(path);
+				bkm.Load();
+				return bkm.ToBk2();
 			}
 
 			// Default to bk2
diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
index 2775068723..1ca4cd7fed 100644
--- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
+++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
@@ -75,6 +75,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
 				bk2.AppendFrame(input);
 			}
 
+			bk2.Save();
 			return bk2;
 		}