diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs
index 9c71eb351e..c9950aaab3 100644
--- a/BizHawk.Client.Common/movie/MovieSession.cs
+++ b/BizHawk.Client.Common/movie/MovieSession.cs
@@ -228,7 +228,7 @@ namespace BizHawk.Client.Common
}
/// is and . does not match .
- public void QueueNewMovie(IMovie movie, bool record, IEmulator emulator)
+ public void QueueNewMovie(IMovie movie, bool record, string systemId)
{
if (movie.IsActive() && movie.Changes)
{
@@ -239,10 +239,10 @@ namespace BizHawk.Client.Common
{
movie.Load(false);
- if (movie.SystemID != emulator.SystemId)
+ if (movie.SystemID != systemId)
{
throw new MoviePlatformMismatchException(
- $"Movie system Id ({movie.SystemID}) does not match the currently loaded platform ({emulator.SystemId}), unable to load");
+ $"Movie system Id ({movie.SystemID}) does not match the currently loaded platform ({systemId}), unable to load");
}
}
@@ -252,7 +252,7 @@ namespace BizHawk.Client.Common
if (!record)
{
- var preference = emulator.SystemId;
+ var preference = systemId;
if (preference == "GBC")
{
// We want to treat GBC the same as GB
diff --git a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
index d29a1ec8fb..c98dddba35 100644
--- a/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
+++ b/BizHawk.Client.Common/movie/interfaces/IMovieSession.cs
@@ -54,7 +54,7 @@ namespace BizHawk.Client.Common
/// When initializing a movie, it will be stored until Rom loading processes have been completed, then it will be moved to the Movie property
/// If an existing movie is still active, it will remain in the Movie property while the new movie is queued
///
- void QueueNewMovie(IMovie movie, bool record, IEmulator emulator);
+ void QueueNewMovie(IMovie movie, bool record, string systemId);
///
/// Sets the Movie property with the QueuedMovie, clears the queued movie, and starts the new movie
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 9f8442b5c8..2ca36bb6cf 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk
try
{
- MovieSession.QueueNewMovie(movie, record, Emulator);
+ MovieSession.QueueNewMovie(movie, record, Emulator.SystemId);
}
catch (MoviePlatformMismatchException ex)
{