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

"fix" issue 246 by causing an absolute termination earlier in the process that makes it clear what happened

This commit is contained in:
goyuken 2014-08-15 17:50:43 +00:00
parent 14282c4740
commit 20f78a579f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,8 +435,11 @@ namespace BizHawk.Client.Common
movie.Load();
if (movie.SystemID != Global.Emulator.SystemId)
{
MessageCallback("Movie does not match the currently loaded system, unable to load");
return;
// 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");
//MessageCallback("Movie does not match the currently loaded system, unable to load");
//return;
}
}