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 #2468 from JosJuice/honor-logging-startup 

Honor logging settings at startup
This commit is contained in:
flacs 2015-06-01 23:56:15 +02:00
parent 1414221bd4 6fb8ce58d6
commit d36df5b1b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Common/Logging/LogManager.cpp
View File

@ -89,17 +89,22 @@ LogManager::LogManager()
IniFile ini; IniFile ini;
ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX)); ini.Load(File::GetUserPath(F_LOGGERCONFIG_IDX));
IniFile::Section* logs = ini.GetOrCreateSection("Logs"); IniFile::Section* logs = ini.GetOrCreateSection("Logs");
IniFile::Section* options = ini.GetOrCreateSection("Options");
bool write_file;
bool write_console;
options->Get("WriteToFile", &write_file, false);
options->Get("WriteToConsole", &write_console, true);
for (LogContainer* container : m_Log) for (LogContainer* container : m_Log)
{ {
bool enable; bool enable;
logs->Get(container->GetShortName(), &enable, false); logs->Get(container->GetShortName(), &enable, false);
container->SetEnable(enable); container->SetEnable(enable);
if (enable) if (enable && write_file)
{
container->AddListener(m_fileLog); container->AddListener(m_fileLog);
if (enable && write_console)
container->AddListener(m_consoleLog); container->AddListener(m_consoleLog);
} }
}
} }
LogManager::~LogManager() LogManager::~LogManager()