ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't allow drag and drop of a movie file if a movie is already active

This commit is contained in:
adelikat 2014-11-29 00:59:14 +00:00
parent fdc9ea2aa9
commit a26e36719a
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -2391,7 +2391,10 @@ namespace BizHawk.Client.EmuHawk
}
else if (MovieService.IsValidMovieExtension(ext))
{
StartNewMovie(MovieService.Get(filePaths[0]), false);
if (!Global.MovieSession.Movie.IsActive)
{
StartNewMovie(MovieService.Get(filePaths[0]), false);
}
}
else if (ext.ToUpper() == ".STATE")
{
@ -2416,32 +2419,35 @@ namespace BizHawk.Client.EmuHawk
else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
{
//tries to open a legacy movie format by importing it
if (CurrentlyOpenRom == null)
if (!Global.MovieSession.Movie.IsActive)
{
OpenRom();
}
else
{
LoadRom(CurrentlyOpenRom);
}
//tries to open a legacy movie format by importing it
if (CurrentlyOpenRom == null)
{
OpenRom();
}
else
{
LoadRom(CurrentlyOpenRom);
}
string errorMsg;
string warningMsg;
var movie = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
if (!string.IsNullOrEmpty(errorMsg))
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
// fix movie extension to something palatable for these purposes.
// for instance, something which doesnt clobber movies you already may have had.
// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
StartNewMovie(movie, false);
}
string errorMsg;
string warningMsg;
var movie = MovieImport.ImportFile(filePaths[0], out errorMsg, out warningMsg);
if (!string.IsNullOrEmpty(errorMsg))
{
MessageBox.Show(errorMsg, "Conversion error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
else
{
// fix movie extension to something palatable for these purposes.
// for instance, something which doesnt clobber movies you already may have had.
// i'm evenly torn between this, and a file in %TEMP%, but since we dont really have a way to clean up this tempfile, i choose this:
StartNewMovie(movie, false);
}
GlobalWin.OSD.AddMessage(warningMsg);
GlobalWin.OSD.AddMessage(warningMsg);
}
}
else
{