summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2014-07-21 17:55:21 +0200
committerJules Blok <jules.blok@gmail.com>2014-07-21 20:50:48 +0200
commit009b4dd3764a983ba5e9476383ea07430cdff8cb (patch)
treebadc57824d6cbeee451de230c473328a3addde08 /Source/Core/VideoBackends
parent36ea1890c8d1b6084a5bc2e80093878af400810a (diff)
Exit exclusive fullscreen when the stop confirmation is shown.
Also have the renderer remember its own fullscreen state. This is done to prevent a case where we exit exclusive fullscreen through the configuration and a focus shift at the same time. In this case the renderer would fail to detect that the fullscreen state was changed.
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/Render.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index ae23516d5c..40b316787f 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -946,10 +946,10 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangl
BOOL fullscreen_state;
if (SUCCEEDED(D3D::swapchain->GetFullscreenState(&fullscreen_state, nullptr)))
{
- if (!!fullscreen_state != fullscreen)
+ if (!!fullscreen_state != fullscreen && Host_RendererHasFocus())
{
// We should be in fullscreen, but we're not. Restore it when we regain focus.
- fullscreen_changed = Host_RendererHasFocus();
+ fullscreen_changed = true;
}
}