From c291ab84576edb82d5d5cdee7135782cbb6984a7 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 4 Oct 2012 11:43:42 +1000 Subject: [PATCH] Fail to start if sync core plugins fail to initialize --- Source/Project64/N64 System/N64 Class.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index b66930dc9..7eba9372c 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -814,10 +814,14 @@ void CN64System::ExecuteSyncCPU () m_Recomp = new CRecompiler(m_Profile,m_EndEmulation); SetActiveSystem(); - m_SyncCPU->SetActiveSystem(); - SetActiveSystem(); - - m_Recomp->Run(); + if (m_SyncCPU->SetActiveSystem()) + { + SetActiveSystem(); + m_Recomp->Run(); + } else { + SetActiveSystem(); + _Notify->DisplayError(MSG_PLUGIN_NOT_INIT); + } } void CN64System::CpuStopped ( void ) {