summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/FrameTools.cpp
diff options
context:
space:
mode:
authorAnthony <Helios747@users.noreply.github.com>2018-02-07 23:35:54 -0800
committerGitHub <noreply@github.com>2018-02-07 23:35:54 -0800
commit096131c9085ff6cb358d03251f666536910d7806 (patch)
tree0e786cfd19885e26aba93636b99a0596d3e51d74 /Source/Core/DolphinWX/FrameTools.cpp
parent4636230f5a8f38b6a70d366615ab43cda11d736a (diff)
parent505d30be3d922f2fba7abe6fd9880f3c8e66767a (diff)
Merge pull request #6334 from stenzek/startup
Video Backend Initialization/Core Boot Improvements
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();