From 6fb2599320082f58b5ac975c2e45ac9824009777 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 5 Feb 2015 22:34:41 +0000 Subject: [PATCH] Disable new movie import system, since I won't be attempting that seriously any time soon --- BizHawk.Client.Common/movie/import/MovieImport.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BizHawk.Client.Common/movie/import/MovieImport.cs b/BizHawk.Client.Common/movie/import/MovieImport.cs index 8d008efd7f..97c42ff241 100644 --- a/BizHawk.Client.Common/movie/import/MovieImport.cs +++ b/BizHawk.Client.Common/movie/import/MovieImport.cs @@ -74,13 +74,13 @@ namespace BizHawk.Client.Common string ext = path != null ? Path.GetExtension(path).ToUpper() : string.Empty; // TODO: reflect off the assembly and find an IMovieImporter with the appropriate ImportExtension metadata - if (ext == ".FM2") - { - var result = new Fm2Import().Import(path); - errorMsg = result.Errors.First(); - warningMsg = result.Errors.First(); - return result.Movie; - } + //if (ext == ".FM2") + //{ + // var result = new Fm2Import().Import(path); + // errorMsg = result.Errors.First(); + // warningMsg = result.Errors.First(); + // return result.Movie; + //} if (ext == ".PJM") {