diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-01-06 11:00:47 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-01-06 11:00:47 +0100 |
| commit | 25fac0282cee6520329294b02c1e9ee08b7a8af6 (patch) | |
| tree | 5b9f991df9e63b369ebb3e837010fb9c9e71458b /Source/Core/DolphinWX/MainNoGUI.cpp | |
| parent | d8d4c94e078b90c4d79f251d6b13bc62a17e2933 (diff) | |
| parent | 399b6248d1042eedc545630b8b2752c148377b88 (diff) | |
Merge pull request #1764 from Armada651/safe-exclusive
D3D: Only try to apply exclusive mode when the renderer is in focus.
Diffstat (limited to 'Source/Core/DolphinWX/MainNoGUI.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/MainNoGUI.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index be3d9a7df3..8d6d0282a6 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -26,6 +26,7 @@ #include "VideoCommon/VideoBackendBase.h" static bool rendererHasFocus = true; +static bool rendererIsFullscreen = false; static bool running = true; class Platform @@ -89,6 +90,11 @@ bool Host_RendererHasFocus() return rendererHasFocus; } +bool Host_RendererIsFullscreen() +{ + return rendererIsFullscreen; +} + void Host_ConnectWiimote(int wm_idx, bool connect) {} void Host_SetWiiMoteConnectionState(int _State) {} @@ -158,7 +164,7 @@ class PlatformX11 : public Platform if (fullscreen) { - X11Utils::ToggleFullscreen(dpy, win); + rendererIsFullscreen = X11Utils::ToggleFullscreen(dpy, win); #if defined(HAVE_XRANDR) && HAVE_XRANDR XRRConfig->ToggleDisplayMode(True); #endif @@ -246,6 +252,7 @@ class PlatformX11 : public Platform (unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowWidth, (unsigned int *)&SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight, &borderDummy, &depthDummy); + rendererIsFullscreen = false; } usleep(100000); } |