summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-07-22 12:42:55 +0200
committerGitHub <noreply@github.com>2017-07-22 12:42:55 +0200
commit57affaff22c1beeb08b76d998d72fb6f44376a47 (patch)
tree8d9e11ce3a2732b37c5c1bd24e13572a39e045df /Source/Core/DolphinWX/Frame.cpp
parent2f0bec93cb3eb02f159461f13557bde4bd2771bb (diff)
parent5729ac0fc685d42035dfa1c850672822a247851c (diff)
Merge pull request #5803 from leoetlino/pause-and-lock
Replace balanced Core::PauseAndLock calls with RunAsCPUThread
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index 29a7b526c3..fc5efddb34 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -1249,9 +1249,7 @@ void CFrame::DoExclusiveFullscreen(bool enable_fullscreen)
if (!g_renderer || g_renderer->IsFullscreen() == enable_fullscreen)
return;
- bool was_unpaused = Core::PauseAndLock(true);
- g_renderer->SetFullscreen(enable_fullscreen);
- Core::PauseAndLock(false, was_unpaused);
+ Core::RunAsCPUThread([enable_fullscreen] { g_renderer->SetFullscreen(enable_fullscreen); });
}
void CFrame::PollHotkeys(wxTimerEvent& event)