diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-27 00:14:56 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-27 00:14:56 +0200 |
| commit | 96cfbd1bb0e03cfdd58c6c9ffa96a5bd17f850f4 (patch) | |
| tree | e785a1c398fd53a0b2c9eef18573c791ffd6046e /Source/Core/DolphinWX/Frame.cpp | |
| parent | 957a39942e00ec13d513f2bf1a0c195644d7803f (diff) | |
| parent | 1f24122d359cc3aadf1029e93118f9523a30350a (diff) | |
Merge pull request #677 from Armada651/use_fullscreen
Frame: Only prevent exclusive fullscreen switches when the emulator is paused
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 43d5185ee3..e1ee904653 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1191,7 +1191,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen) { if (!g_Config.bBorderlessFullscreen && !SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && - Core::GetState() != Core::CORE_RUN) + Core::GetState() == Core::CORE_PAUSE) { // A responsive renderer is required for exclusive fullscreen, but the // renderer can only respond in the running state. Therefore we ignore |