diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 07:33:03 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 07:48:06 +0100 |
| commit | 70f3a069f2b760b2add51046781be625bef758db (patch) | |
| tree | 23b74ddd0815882d3a598c67ac11fc7ecf95e98a /Source/Core/DolphinWX/Frame.cpp | |
| parent | 60a5d8900bd2bf63e4af32d60ec7f69053e13297 (diff) | |
Revert "Merge pull request #83 from lioncash/remove-console"
This breaks Linux stdout logging.
This reverts commit 7ac5b1f2f805b2bc553492606cf71b6609fa0ae7, reversing
changes made to 9bc14012fccf92f38b7d270ec82f7dac522986c5.
Revert "Merge pull request #77 from lioncash/remove-console"
This reverts commit 9bc14012fccf92f38b7d270ec82f7dac522986c5, reversing
changes made to b18a33377d7229a66226a524186d24c57f1d56aa.
Conflicts:
Source/Core/Common/LogManager.cpp
Source/Core/DolphinWX/Frame.cpp
Source/Core/DolphinWX/FrameAui.cpp
Source/Core/DolphinWX/LogConfigWindow.cpp
Source/Core/DolphinWX/LogWindow.cpp
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index f1c27733b2..d348c5617f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -44,6 +44,7 @@ #include <wx/aui/framemanager.h> #include "Common/Common.h" +#include "Common/ConsoleListener.h" #include "Common/FileUtil.h" #include "Common/Thread.h" @@ -309,8 +310,11 @@ CFrame::CFrame(wxFrame* parent, for (int i = 0; i <= IDM_CODEWINDOW - IDM_LOGWINDOW; i++) bFloatWindow[i] = false; - if (ShowLogWindow) - SConfig::GetInstance().m_InterfaceLogWindow = true; + 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(); // Start debugging maximized if (UseDebugger) this->Maximize(true); @@ -388,6 +392,8 @@ CFrame::CFrame(wxFrame* parent, ToggleLogWindow(true); if (SConfig::GetInstance().m_InterfaceLogConfigWindow) ToggleLogConfigWindow(true); + if (SConfig::GetInstance().m_InterfaceConsole) + ToggleConsole(true); } // Show window @@ -675,6 +681,7 @@ 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()) { |