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
This commit is contained in:
parent
41c98f982e
commit
5027554beb
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue