diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index b571fca0d5..8edc03fd6e 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -61,15 +61,21 @@ namespace BizHawk.Client.EmuHawk filename = string.Empty; } - var file = OpenFileDialog( - filename, - PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null), - "Tas Project Files", - "tasproj"); - - if (file != null) + // need to be fancy here, so call the ofd constructor directly instead of helper + var all = "*." + string.Join(";*.", MovieService.MovieExtensions.Reverse()); + var ofd = new OpenFileDialog { - LoadFile(file); + FileName = filename, + InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.MoviesPathFragment, null), + Filter = string.Format( + "All Available Files ({0})|{0}|TAS Project Files (*.{1})|*.{1}|Movie Files (*.{2})|*.{2}|All Files|*.*", + all, TasMovie.Extension, MovieService.DefaultExtension) + }; + + var result = ofd.ShowHawkDialog(); + if (result == DialogResult.OK) + { + LoadFile(new FileInfo(ofd.FileName)); } } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index ad2b599b1e..21839f4cf5 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -626,12 +626,12 @@ namespace BizHawk.Client.EmuHawk var result1 = MessageBox.Show("This is a regular movie, a new project must be created from it, in order to use in TAStudio\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); if (result1 == DialogResult.OK) { + StartNewMovieWrapper(false, movie); ConvertCurrentMovieToTasproj(); + SetUpColumns(); + return true; } - else - { - return false; - } + return false; } else {