From 1f39160999ab1fc44a2e802ca26af27c715d295c Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 11 Jul 2020 18:03:53 -0500 Subject: [PATCH] give up on the idea of throwing an exception when attaching a core to a movie. The reason this doesn't work is that restart movie keeps the movie in memory (which was previously attached). This commit decrees that it is safe to keep a movie in memory, and attach to a new instance of the same core. The alternative is that movies would have to save and load on restart which is slow and may not be desired --- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs | 9 --------- .../movie/tasproj/TasStateManager.cs | 5 ----- 2 files changed, 14 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 87ce097594..1fdff995bc 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -24,15 +24,6 @@ namespace BizHawk.Client.Common public virtual void Attach(IEmulator emulator) { - // 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; } diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/src/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs index 591193afc9..6aa441231f 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs @@ -46,11 +46,6 @@ namespace BizHawk.Client.Common public void Attach(IEmulator emulator) { - if (!_emulator.IsNull()) - { - throw new InvalidOperationException("A core has already been attached!"); - } - if (!emulator.HasSavestates()) { throw new InvalidOperationException($"A core must be able to provide an {nameof(IStatable)} service");