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

Don't allow movie to be loaded if it doesn't match the current system, since that causes core specific mayhem. Also make a movie loading hack a bit more logical

This commit is contained in:
adelikat 2014-07-04 13:07:21 +00:00
parent f2a891698b
commit e6acadf118
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -12,6 +12,13 @@ namespace BizHawk.Client.EmuHawk
{ {
public void StartNewMovie(IMovie movie, bool record, bool fromTastudio = false) //TasStudio flag is a hack for now public void StartNewMovie(IMovie movie, bool record, bool fromTastudio = false) //TasStudio flag is a hack for now
{ {
if (movie.SystemID != Global.Emulator.SystemId)
{
GlobalWin.OSD.AddMessage("Movie does not match the currently loaded system, unable to load");
return;
}
//If a movie is already loaded, save it before starting a new movie //If a movie is already loaded, save it before starting a new movie
if (!fromTastudio && Global.MovieSession.Movie.IsActive) if (!fromTastudio && Global.MovieSession.Movie.IsActive)
{ {
@ -56,7 +63,11 @@ namespace BizHawk.Client.EmuHawk
_syncSettingsHack = ConfigService.LoadWithType(s); _syncSettingsHack = ConfigService.LoadWithType(s);
} }
if (record) // This is a hack really, the movie isn't active yet unless I do this, and LoadRom wants to know if it is if (record) // This is a hack really, we need to set the movie to its propert state so that it will be considered active later
{
Global.MovieSession.Movie.SwitchToRecord();
}
else
{ {
Global.MovieSession.Movie.SwitchToRecord(); Global.MovieSession.Movie.SwitchToRecord();
} }