From bdc2198b3f396811aeb5d849cbc2c0ca58d57fb4 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 13 Sep 2012 00:29:19 +0000 Subject: [PATCH] Play Movie Dialog - fix duplicate movie bug --- BizHawk.MultiClient/PlayMovie.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs index 1f3ec706bb..27e3b30720 100644 --- a/BizHawk.MultiClient/PlayMovie.cs +++ b/BizHawk.MultiClient/PlayMovie.cs @@ -289,10 +289,18 @@ namespace BizHawk.MultiClient string extension = "*." + Global.Config.MovieExtension; foreach (string f in Directory.GetFiles(d, "*." + Global.Config.MovieExtension)) AddMovieToList(f, false); - foreach (string f in Directory.GetFiles(d, "*.tas")) - AddMovieToList(f, false); - foreach (string f in Directory.GetFiles(d, "*.bkm")) - AddMovieToList(f, false); + + if (Global.Config.MovieExtension != "*.tas") + { + foreach (string f in Directory.GetFiles(d, "*.tas")) + AddMovieToList(f, false); + } + else if (Global.Config.MovieExtension != "*.bkm") + { + foreach (string f in Directory.GetFiles(d, "*.bkm")) + AddMovieToList(f, false); + } + if (Global.Config.PlayMovie_ShowStateFiles) { foreach (string f in Directory.GetFiles(d, "*.state"))