diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-12 23:20:01 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-12 23:20:01 -0500 |
commit | af1cd769e7b407af71496e788e218add31f8b2b0 (patch) | |
tree | 1e3fd71256c04a15970b09abd3f7280f8b1ff678 /src/citra_qt/bootmanager.cpp | |
parent | a6791e4fc73dda4853c8363d8ecf5094dbedd0ab (diff) | |
parent | 4d2a6f8b9b3eeb85574a5e4f93422ffd4feebcd3 (diff) |
Merge pull request #258 from yuriks/log-ng
New logging system
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index b53206be6..6d08d6afc 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -62,7 +62,7 @@ void EmuThread::Stop() { if (!isRunning()) { - INFO_LOG(MASTER_LOG, "EmuThread::Stop called while emu thread wasn't running, returning..."); + LOG_WARNING(Frontend, "EmuThread::Stop called while emu thread wasn't running, returning..."); return; } stop_run = true; @@ -76,7 +76,7 @@ void EmuThread::Stop() wait(1000); if (isRunning()) { - WARN_LOG(MASTER_LOG, "EmuThread still running, terminating..."); + LOG_WARNING(Frontend, "EmuThread still running, terminating..."); quit(); // TODO: Waiting 50 seconds can be necessary if the logging subsystem has a lot of spam @@ -84,11 +84,11 @@ void EmuThread::Stop() wait(50000); if (isRunning()) { - WARN_LOG(MASTER_LOG, "EmuThread STILL running, something is wrong here..."); + LOG_CRITICAL(Frontend, "EmuThread STILL running, something is wrong here..."); terminate(); } } - INFO_LOG(MASTER_LOG, "EmuThread stopped"); + LOG_INFO(Frontend, "EmuThread stopped"); } |