mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-01 05:38:50 +00:00
Fix auto window size options when not rendering to main.
Switch gtk keystate_lock back to a recursive mutex. Now that the mutex attributes are being initialized properly this doesn't seem to cause the segmentation faults anymore. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7349 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
f43a8844a2
commit
27142fafe0
4 changed files with 8 additions and 7 deletions
|
@ -584,8 +584,8 @@ bool Host_GetKeyState(int keycode)
|
|||
#ifdef _WIN32
|
||||
return GetAsyncKeyState(keycode);
|
||||
#elif defined __WXGTK__
|
||||
std::unique_lock<std::mutex> lk(main_frame->keystate_lock, std::defer_lock);
|
||||
if (!lk.try_lock())
|
||||
std::unique_lock<std::recursive_mutex> lk(main_frame->keystate_lock, std::try_to_lock);
|
||||
if (!lk.owns_lock())
|
||||
return false;
|
||||
|
||||
bool key_pressed;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue