summaryrefslogtreecommitdiff
path: root/Source/Core/Common/Logging/LogManager.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2018-08-27 13:36:04 +0200
committerGitHub <noreply@github.com>2018-08-27 13:36:04 +0200
commitea26ccbbe1682547a2ea6a3fc4a5983a72958a42 (patch)
treefe88eb9ef5f18744e50b8e87f700cf8dc3c051e7 /Source/Core/Common/Logging/LogManager.cpp
parent62928de54753a9b4c40b8bf06578cb7e0ac04996 (diff)
parente2a557e7396c52551b8b69e20626e20c1c73a430 (diff)
Merge pull request #7318 from VinDuv/rename-master-log
LogManager: Change Master Log short name to fix log configuration loading
Diffstat (limited to 'Source/Core/Common/Logging/LogManager.cpp')
-rw-r--r--Source/Core/Common/Logging/LogManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index b9a56f8df5..5541fce843 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -109,7 +109,7 @@ LogManager::LogManager()
m_log[LogTypes::IOS_WC24] = {"IOS_WC24", "IOS - WiiConnect24"};
m_log[LogTypes::IOS_WFS] = {"IOS_WFS", "IOS - WFS"};
m_log[LogTypes::IOS_WIIMOTE] = {"IOS_WIIMOTE", "IOS - Wii Remote"};
- m_log[LogTypes::MASTER_LOG] = {"*", "Master Log"};
+ m_log[LogTypes::MASTER_LOG] = {"MASTER", "Master Log"};
m_log[LogTypes::MEMCARD_MANAGER] = {"MemCard Manager", "MemCard Manager"};
m_log[LogTypes::MEMMAP] = {"MI", "MI & memmap"};
m_log[LogTypes::NETPLAY] = {"NETPLAY", "Netplay"};