diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-08 15:54:06 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-08 15:54:06 +1300 |
| commit | 886060aaf7dbeb5b6dd36390b2adf64ccacf9e85 (patch) | |
| tree | c371332817817e0e05a6fd9f307a6690a3d90886 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 6704832f3d78988ca694c23d8ea0f1262cc37d58 (diff) | |
| parent | 8d57f38be7af319cfecc450bd183d9c7932664c8 (diff) | |
Merge pull request #96 from lioncash/remove-console-correctly
Remove console correctly
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index d348c5617f..abb35f390f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -310,14 +310,13 @@ CFrame::CFrame(wxFrame* parent, for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++) bFloatWindow[i] = false; - if (ShowLogWindow) SConfig::GetInstance().m_InterfaceLogWindow = true; - - // Give it a console early to show potential messages from this onward - ConsoleListener *Console = LogManager::GetInstance()->GetConsoleListener(); - if (SConfig::GetInstance().m_InterfaceConsole) Console->Open(); + if (ShowLogWindow) + SConfig::GetInstance().m_InterfaceLogWindow = true; // Start debugging maximized - if (UseDebugger) this->Maximize(true); + if (UseDebugger) + this->Maximize(true); + // Debugger class if (UseDebugger) { @@ -392,8 +391,6 @@ CFrame::CFrame(wxFrame* parent, ToggleLogWindow(true); if (SConfig::GetInstance().m_InterfaceLogConfigWindow) ToggleLogConfigWindow(true); - if (SConfig::GetInstance().m_InterfaceConsole) - ToggleConsole(true); } // Show window @@ -681,7 +678,6 @@ void CFrame::OnRenderWindowSizeRequest(int width, int height) // Add space for the log/console/debugger window if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain && (SConfig::GetInstance().m_InterfaceLogWindow || - SConfig::GetInstance().m_InterfaceConsole || SConfig::GetInstance().m_InterfaceLogConfigWindow) && !m_Mgr->GetPane(wxT("Pane 1")).IsFloating()) { |