From 35de59488a6184e0dbfac97dbb8668fc5356a909 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 30 May 2020 16:35:20 -0500 Subject: [PATCH] fix Movie restart I broke some days ago --- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 4c3bd26200..3c50b4e5f5 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -21,10 +21,14 @@ namespace BizHawk.Client.Common public virtual void Attach(IMovieSession session, IEmulator emulator) { - if (!Emulator.IsNull()) - { - throw new InvalidOperationException("A core has already been attached!"); - } + // TODO: this check would ideally happen + // but is disabled for now because restarting a movie doesn't new one up + // so the old one hangs around with old emulator until this point + // maybe we should new it up, or have a detach method + //if (!Emulator.IsNull()) + //{ + // throw new InvalidOperationException("A core has already been attached!"); + //} Emulator = emulator; Session = session;