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

Band-aid for movie code, note: the case of loading a new rom while a movie is active still is probably bugged

This commit is contained in:
adelikat 2014-07-31 23:52:03 +00:00
parent 09be2c6c7a
commit fb8d322146
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,6 +300,11 @@ namespace BizHawk.Client.EmuHawk
private void CloseRomMenuItem_Click(object sender, EventArgs e) private void CloseRomMenuItem_Click(object sender, EventArgs e)
{ {
if (Global.MovieSession.Movie.IsActive)
{
Global.MovieSession.Movie.Stop();
}
CloseRom(); CloseRom();
} }
@ -2365,7 +2370,7 @@ namespace BizHawk.Client.EmuHawk
else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0]))) else if (MovieImport.IsValidMovieExtension(Path.GetExtension(filePaths[0])))
{ {
//tries to open a legacy movie format as if it were a BKM, by importing it //tries to open a legacy movie format by importing it
if (CurrentlyOpenRom == null) if (CurrentlyOpenRom == null)
{ {
OpenRom(); OpenRom();

7
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3290,13 +3290,6 @@ namespace BizHawk.Client.EmuHawk
Global.AutoFireController = Global.AutofireNullControls; Global.AutoFireController = Global.AutofireNullControls;
RewireSound(); RewireSound();
// adelikat: TODO: Ugly hack! But I don't know a way around this yet.
if (!(Global.MovieSession.Movie is TasMovie))
{
Global.MovieSession.Movie.Stop();
}
RebootStatusBarIcon.Visible = false; RebootStatusBarIcon.Visible = false;
} }