diff --git a/src/BizHawk.Client.Common/movie/import/IMovieImport.cs b/src/BizHawk.Client.Common/movie/import/IMovieImport.cs index 4de3f255e5..c67fccc3bd 100644 --- a/src/BizHawk.Client.Common/movie/import/IMovieImport.cs +++ b/src/BizHawk.Client.Common/movie/import/IMovieImport.cs @@ -9,7 +9,12 @@ namespace BizHawk.Client.Common { public interface IMovieImport { - ImportResult Import(IMovieSession session, IEmulator emulator, string path, Config config); + ImportResult Import( + IDialogParent dialogParent, + IMovieSession session, + IEmulator emulator, + string path, + Config config); } internal abstract class MovieImporter : IMovieImport @@ -18,8 +23,16 @@ namespace BizHawk.Client.Common protected const string Md5 = "MD5"; protected const string MovieOrigin = "MovieOrigin"; - public ImportResult Import(IMovieSession session, IEmulator emulator, string path, Config config) + protected IDialogParent _dialogParent; + + public ImportResult Import( + IDialogParent dialogParent, + IMovieSession session, + IEmulator emulator, + string path, + Config config) { + _dialogParent = dialogParent; SourceFile = new FileInfo(path); Config = config; diff --git a/src/BizHawk.Client.Common/movie/import/MovieImport.cs b/src/BizHawk.Client.Common/movie/import/MovieImport.cs index ae918ef963..041bfe4916 100644 --- a/src/BizHawk.Client.Common/movie/import/MovieImport.cs +++ b/src/BizHawk.Client.Common/movie/import/MovieImport.cs @@ -31,7 +31,12 @@ namespace BizHawk.Client.Common ); // Attempt to import another type of movie file into a movie object. - public static ImportResult ImportFile(IMovieSession session, IEmulator emulator, string path, Config config) + public static ImportResult ImportFile( + IDialogParent dialogParent, + IMovieSession session, + IEmulator emulator, + string path, + Config config) { string ext = Path.GetExtension(path) ?? ""; var importerType = ImporterForExtension(ext); @@ -48,7 +53,7 @@ namespace BizHawk.Client.Common return importer == null ? ImportResult.Error($"No importer found for file type {ext}") - : importer.Import(session, emulator, path, config); + : importer.Import(dialogParent, session, emulator, path, config); } private static Type ImporterForExtension(string ext) diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index aeb37839af..b63c2e13d8 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -3994,7 +3994,7 @@ namespace BizHawk.Client.EmuHawk private void ProcessMovieImport(string fn, bool start) { - var result = MovieImport.ImportFile(MovieSession, Emulator, fn, Config); + var result = MovieImport.ImportFile(this, MovieSession, Emulator, fn, Config); if (result.Errors.Any()) {