summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Frame.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-10-07 16:46:10 +0200
committerJules Blok <jules.blok@gmail.com>2014-10-07 16:48:43 +0200
commit39f421d45ddf9ba77ad8e6a3ee676bcd31157a52 (patch)
treee91151a875a8af98627b4d57419f0a10a1fab0e7 /Source/Core/DolphinWX/Frame.cpp
parent7344f752b7d6e78e2c48069a0476076a7e2f0b22 (diff)
Support the borderless fullscreen option in all backends.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
-rw-r--r--Source/Core/DolphinWX/Frame.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp
index c33ebf5e3c..b101357d02 100644
--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@@ -187,7 +187,7 @@ WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
bool CRenderFrame::ShowFullScreen(bool show, long style)
{
- if (show)
+ if (show && !g_Config.bBorderlessFullscreen)
{
// OpenGL requires the pop-up style to activate exclusive mode.
SetWindowStyle((GetWindowStyle() & ~wxDEFAULT_FRAME_STYLE) | wxPOPUP_WINDOW);