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

This commit is contained in:
adelikat 2014-08-17 00:13:00 +00:00
parent 6ba7212f43
commit b91180d6a0
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -382,18 +382,18 @@ namespace BizHawk.Client.Common
{ {
if (Global.Config.VBAStyleMovieLoadState) if (Global.Config.VBAStyleMovieLoadState)
{ {
MessageCallback("Multi-track can not be used in Full Movie Loadstates mode"); Output("Multi-track can not be used in Full Movie Loadstates mode");
} }
else else
{ {
MultiTrack.IsActive ^= true; MultiTrack.IsActive ^= true;
MultiTrack.SelectNone(); MultiTrack.SelectNone();
MessageCallback(MultiTrack.IsActive ? "MultiTrack Enabled" : "MultiTrack Disabled"); Output(MultiTrack.IsActive ? "MultiTrack Enabled" : "MultiTrack Disabled");
} }
} }
else else
{ {
MessageCallback("MultiTrack cannot be enabled while not recording."); Output("MultiTrack cannot be enabled while not recording.");
} }
} }
@ -425,11 +425,7 @@ namespace BizHawk.Client.Common
movie.Load(); movie.Load();
if (movie.SystemID != Global.Emulator.SystemId) if (movie.SystemID != Global.Emulator.SystemId)
{ {
// MessageCallback() is too weak for this. it's a basically fatal error; QueuedMovie never gets set, and we get other exceptions later
// that don't make it clear what actually went wrong
throw new InvalidOperationException("Movie does not match the currently loaded system, unable to load"); throw new InvalidOperationException("Movie does not match the currently loaded system, unable to load");
//MessageCallback("Movie does not match the currently loaded system, unable to load");
//return;
} }
} }