From b91180d6a0cf1cba1a09025abfa211820f502cd7 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 17 Aug 2014 00:13:00 +0000 Subject: [PATCH] --- BizHawk.Client.Common/movie/MovieSession.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/BizHawk.Client.Common/movie/MovieSession.cs b/BizHawk.Client.Common/movie/MovieSession.cs index aaef3ba5b8..dd7570117b 100644 --- a/BizHawk.Client.Common/movie/MovieSession.cs +++ b/BizHawk.Client.Common/movie/MovieSession.cs @@ -382,18 +382,18 @@ namespace BizHawk.Client.Common { 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 { MultiTrack.IsActive ^= true; MultiTrack.SelectNone(); - MessageCallback(MultiTrack.IsActive ? "MultiTrack Enabled" : "MultiTrack Disabled"); + Output(MultiTrack.IsActive ? "MultiTrack Enabled" : "MultiTrack Disabled"); } } 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(); 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"); - //MessageCallback("Movie does not match the currently loaded system, unable to load"); - //return; } }