From 5027554beb04272f675d02c6e299b64130ece5f0 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Wed, 16 Mar 2011 01:12:27 +0000 Subject: [PATCH] Build fix for linux, and fix a deadlock when the core is initiated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7354 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/Core.cpp | 4 ++-- Source/Core/DolphinWX/Src/Frame.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 996ed0aa09..8ebf7f8752 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -351,6 +351,8 @@ void EmuThread() DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); + emuThreadGoing.Sync(); + // Load GCM/DOL/ELF whatever ... we boot with the interpreter core PowerPC::SetMode(PowerPC::MODE_INTERPRETER); CBoot::BootUp(); @@ -366,8 +368,6 @@ void EmuThread() Host_UpdateDisasmDialog(); Host_UpdateMainFrame(); - emuThreadGoing.Sync(); - // ENTER THE VIDEO THREAD LOOP if (_CoreParameter.bCPUThread) { diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 2c025a7ba2..76d4685747 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -139,13 +139,12 @@ public: void ToggleDisplayMode (bool bFullscreen); static void ConnectWiimote(int wm_idx, bool connect); - std::recursive_mutex keystate_lock; const CGameListCtrl *GetGameListCtrl() const; #ifdef __WXGTK__ Common::Event panic_event; bool bPanicResult; - std::mutex keystate_lock; + std::recursive_mutex keystate_lock; #endif #if defined(HAVE_XRANDR) && HAVE_XRANDR