From 9db5ee2e7b65eb273729e99fb3727e6725103606 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 29 Aug 2020 18:14:49 -0500 Subject: [PATCH] hack to fix Tastudio loading when importing an existing bk2 --- src/BizHawk.Client.Common/movie/MovieSession.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/movie/MovieSession.cs b/src/BizHawk.Client.Common/movie/MovieSession.cs index d0f0be34d6..a8fce0296a 100644 --- a/src/BizHawk.Client.Common/movie/MovieSession.cs +++ b/src/BizHawk.Client.Common/movie/MovieSession.cs @@ -277,7 +277,8 @@ namespace BizHawk.Client.Common _modeChangedCallback(); } - if (Movie is IDisposable d) + if (Movie is IDisposable d + && Movie != _queuedMovie) // Uberhack, remove this and Loading Tastudio with a bk2 already loaded breaks, probably other TAStudio scenarios as well { d.Dispose(); }