From 60d69db588d3ccfbbc53a0253fce10c3fe55204c Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 19 Feb 2017 00:26:25 +0300
Subject: [PATCH] tastudio: stop crashing upon movie platform mismatch make the
 error window topmost

---
 BizHawk.Client.EmuHawk/MainForm.Movie.cs          | 2 +-
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 6029904ed9..f8c5f80183 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			catch (MoviePlatformMismatchException ex)
 			{
-				MessageBox.Show(this, ex.Message, "Movie/Platform Mismatch", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				MessageBox.Show(new Form(){TopMost = true}, ex.Message, "Movie/Platform Mismatch", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return false;
 			}
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 0ee546b090..7c5ac42d94 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -648,7 +648,8 @@ namespace BizHawk.Client.EmuHawk
 				movie = CurrentTasMovie;
 			SetTasMovieCallbacks(movie as TasMovie);
 			bool result = Mainform.StartNewMovie(movie, record);
-			CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
+			if (result)
+				CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always.
 			TastudioPlayMode();
 			_initializing = false;