ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5772 from ligfx/fixwxlogconfig 

DolphinWX: fix logging crash + settings not being saved
This commit is contained in:
Leo Lam 2017-07-11 00:17:57 +02:00 committed by GitHub
parent 07ab81e1bd 06f1761f9f
commit b5dfde12ad
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/LogConfigWindow.cpp
View File

@ -89,7 +89,7 @@ void LogConfigWindow::CreateGUIControls()
void LogConfigWindow::LoadSettings() void LogConfigWindow::LoadSettings()
{ {
m_verbosity->SetSelection(m_LogManager->GetLogLevel()); m_verbosity->SetSelection(m_LogManager->GetLogLevel() - 1);
// Get the logger output settings from the config ini file. // Get the logger output settings from the config ini file.
m_writeFileCB->SetValue(m_LogManager->IsListenerEnabled(LogListener::FILE_LISTENER)); m_writeFileCB->SetValue(m_LogManager->IsListenerEnabled(LogListener::FILE_LISTENER));
@ -117,8 +117,7 @@ void LogConfigWindow::SaveSettings()
// If the verbosity changes while logging // If the verbosity changes while logging
void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event) void LogConfigWindow::OnVerbosityChange(wxCommandEvent& event)
{ {
int v = m_verbosity->GetSelection() + 1; m_LogManager->SetLogLevel(static_cast<LogTypes::LOG_LEVELS>(m_verbosity->GetSelection() + 1));
m_LogManager->SetLogLevel(static_cast<LogTypes::LOG_LEVELS>(v));
event.Skip(); event.Skip();
} }

6
Source/Core/DolphinWX/LogWindow.cpp
View File

@ -129,11 +129,7 @@ CLogWindow::~CLogWindow()
void CLogWindow::RemoveAllListeners() void CLogWindow::RemoveAllListeners()
{ {
if (!m_has_listeners) m_LogManager->RegisterListener(LogListener::LOG_WINDOW_LISTENER, nullptr);
return;
m_has_listeners = false;
m_LogManager->EnableListener(LogListener::LOG_WINDOW_LISTENER, false);
} }
void CLogWindow::SaveSettings() void CLogWindow::SaveSettings()

1
Source/Core/DolphinWX/LogWindow.h
View File

@ -46,7 +46,6 @@ private:
LogManager* m_LogManager; LogManager* m_LogManager;
std::queue<std::pair<u8, wxString>> msgQueue; std::queue<std::pair<u8, wxString>> msgQueue;
bool m_LogAccess; bool m_LogAccess;
bool m_has_listeners = true;
// Controls // Controls
wxBoxSizer* sBottom; wxBoxSizer* sBottom;