piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 10:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4439 from Armada651/yield-ui

Browse Source 
CPU: Fix deadlocks by periodically yielding to the UI message pump.
This commit is contained in:
Jules Blok
2016-11-11 20:30:31 +01:00
committed by GitHub
parent fbfce2a043 20d49ba97f
commit f0ce3275af
9 changed files with 80 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Main.cpp
View File

@ -10,6 +10,7 @@
#include <wx/app.h>
#include <wx/buffer.h>
#include <wx/cmdline.h>
#include <wx/evtloop.h>
#include <wx/image.h>
#include <wx/imagpng.h>
#include <wx/intl.h>
@ -547,3 +548,8 @@ void Host_ShowVideoConfig(void* parent, const std::string& backend_name)
diag.ShowModal();
}
}
void Host_YieldToUI()
{
wxGetApp().GetMainLoop()->YieldFor(wxEVT_CATEGORY_UI);
}

4
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -161,6 +161,10 @@ void Host_ShowVideoConfig(void*, const std::string&)
{
}
void Host_YieldToUI()
{
}
#if HAVE_X11
#include <X11/keysym.h>
#include "DolphinWX/X11Utils.h"