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

LogManager: Check if listener is valid before using it

This commit is contained in:
Léo Lam 2017-06-17 10:39:06 +02:00
parent a2ad3e14d0
commit dd8dcdf880
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,8 @@ void LogManager::LogWithFullPath(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE
LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName().c_str(), temp); LogTypes::LOG_LEVEL_TO_CHAR[(int)level], log->GetShortName().c_str(), temp);
for (auto listener_id : *log) for (auto listener_id : *log)
m_listeners[listener_id]->Log(level, msg.c_str()); if (m_listeners[listener_id])
m_listeners[listener_id]->Log(level, msg.c_str());
} }
void LogManager::Init() void LogManager::Init()

2
Source/Core/Common/Logging/LogManager.h
View File

@ -86,7 +86,7 @@ class LogManager : NonCopyable
private: private:
LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS]; LogContainer* m_Log[LogTypes::NUMBER_OF_LOGS];
static LogManager* m_logManager; // Singleton. Ugh. static LogManager* m_logManager; // Singleton. Ugh.
std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners; std::array<LogListener*, LogListener::NUMBER_OF_LISTENERS> m_listeners{};
size_t m_path_cutoff_point = 0; size_t m_path_cutoff_point = 0;
LogManager(); LogManager();