summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2018-01-26 15:15:35 +1000
committerStenzek <stenzek@gmail.com>2018-01-27 14:17:14 +1000
commit505d30be3d922f2fba7abe6fd9880f3c8e66767a (patch)
treefec31ac019daafacce293c0997aeea1d80fdac20 /Source/Core/DolphinWX/FrameTools.cpp
parentc790077c139dad43586a87d8080b4b9107167930 (diff)
DolphinWX: Move fullscreen switch to after startup is complete
This means that any error messages won't be hidden by the fullscreen window.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
-rw-r--r--Source/Core/DolphinWX/FrameTools.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp
index 28bce659e3..7f35afbc5f 100644
--- a/Source/Core/DolphinWX/FrameTools.cpp
+++ b/Source/Core/DolphinWX/FrameTools.cpp
@@ -717,6 +717,7 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
m_render_parent = new wxPanel(m_render_frame, IDM_MPANEL, wxDefaultPosition, wxDefaultSize, 0);
#endif
m_render_frame->Show();
+ m_render_frame->Raise();
}
#if defined(__APPLE__)
@@ -724,15 +725,10 @@ void CFrame::StartGame(std::unique_ptr<BootParameters> boot)
#endif
wxBusyCursor hourglass;
-
- DoFullscreen(SConfig::GetInstance().bFullscreen);
-
SetDebuggerStartupParameters();
if (!BootManager::BootCore(std::move(boot)))
{
- DoFullscreen(false);
-
// Destroy the renderer frame when not rendering to main
if (!SConfig::GetInstance().bRenderToMain)
m_render_frame->Destroy();