From 20f78a579f64274c482fc964e3c056e80a7f91c3 Mon Sep 17 00:00:00 2001 From: goyuken Date: Fri, 15 Aug 2014 17:50:43 +0000 Subject: [PATCH] "fix" issue 246 by causing an absolute termination earlier in the process that makes it clear what happened --- BizHawk.Client.Common/movie/MovieSession.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index bbcb9c306b..eb1376acbf 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -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; } }