diff options
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 14 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 79d62f1717..d751024d85 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -213,6 +213,14 @@ bool Init() GetData<u8>("IPL.AR")); } + // _CoreParameter.hMainWindow is first the m_Panel handle, + // then it is updated to have the new window handle, + // within g_video_backend->Initialize() + // TODO: that's ugly, change Initialize() to take m_Panel + // and return the new window handle + g_video_backend->Initialize(); + g_pWindowHandle = _CoreParameter.hMainWindow; + HW::Init(); DSP::GetDSPEmulator()->Initialize(g_pWindowHandle, _CoreParameter.bWii, _CoreParameter.bDSPThread); @@ -370,12 +378,6 @@ void EmuThread() emuThreadGoing.Set(); - // _CoreParameter.hMainWindow is first the m_Panel handle, then it is updated to have the new window handle, - // within g_video_backend->Initialize() - // TODO: that's ugly, change Initialize() to take m_Panel and return the new window handle - g_video_backend->Initialize(); - g_pWindowHandle = _CoreParameter.hMainWindow; - DisplayMessage("CPU: " + cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index cb16666ab8..b102be2415 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -686,10 +686,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event) void CFrame::GetRenderWindowSize(int& x, int& y, int& width, int& height) { - wxMutexGuiEnter(); m_RenderParent->GetClientSize(&width, &height); m_RenderParent->GetPosition(&x, &y); - wxMutexGuiLeave(); } void CFrame::OnRenderWindowSizeRequest(int width, int height) |