diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 8 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/util/spinbox.cpp | 2 |
4 files changed, 9 insertions, 9 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() | |||
| 62 | { | 62 | { |
| 63 | if (!isRunning()) | 63 | if (!isRunning()) |
| 64 | { | 64 | { |
| 65 | INFO_LOG(MASTER_LOG, "EmuThread::Stop called while emu thread wasn't running, returning..."); | 65 | LOG_WARNING(Frontend, "EmuThread::Stop called while emu thread wasn't running, returning..."); |
| 66 | return; | 66 | return; |
| 67 | } | 67 | } |
| 68 | stop_run = true; | 68 | stop_run = true; |
| @@ -76,7 +76,7 @@ void EmuThread::Stop() | |||
| 76 | wait(1000); | 76 | wait(1000); |
| 77 | if (isRunning()) | 77 | if (isRunning()) |
| 78 | { | 78 | { |
| 79 | WARN_LOG(MASTER_LOG, "EmuThread still running, terminating..."); | 79 | LOG_WARNING(Frontend, "EmuThread still running, terminating..."); |
| 80 | quit(); | 80 | quit(); |
| 81 | 81 | ||
| 82 | // TODO: Waiting 50 seconds can be necessary if the logging subsystem has a lot of spam | 82 | // TODO: Waiting 50 seconds can be necessary if the logging subsystem has a lot of spam |
| @@ -84,11 +84,11 @@ void EmuThread::Stop() | |||
| 84 | wait(50000); | 84 | wait(50000); |
| 85 | if (isRunning()) | 85 | if (isRunning()) |
| 86 | { | 86 | { |
| 87 | WARN_LOG(MASTER_LOG, "EmuThread STILL running, something is wrong here..."); | 87 | LOG_CRITICAL(Frontend, "EmuThread STILL running, something is wrong here..."); |
| 88 | terminate(); | 88 | terminate(); |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | INFO_LOG(MASTER_LOG, "EmuThread stopped"); | 91 | LOG_INFO(Frontend, "EmuThread stopped"); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | 94 | ||
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index df5579e15..53394b6e6 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp | |||
| @@ -45,7 +45,7 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const | |||
| 45 | map.insert({Pica::DebugContext::Event::IncomingPrimitiveBatch, tr("Incoming primitive batch")}); | 45 | map.insert({Pica::DebugContext::Event::IncomingPrimitiveBatch, tr("Incoming primitive batch")}); |
| 46 | map.insert({Pica::DebugContext::Event::FinishedPrimitiveBatch, tr("Finished primitive batch")}); | 46 | map.insert({Pica::DebugContext::Event::FinishedPrimitiveBatch, tr("Finished primitive batch")}); |
| 47 | 47 | ||
| 48 | _dbg_assert_(GUI, map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); | 48 | _dbg_assert_(Debug_GPU, map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); |
| 49 | 49 | ||
| 50 | return map[event]; | 50 | return map[event]; |
| 51 | } | 51 | } |
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 2e3025295..5293263cd 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -158,18 +158,18 @@ GMainWindow::~GMainWindow() | |||
| 158 | 158 | ||
| 159 | void GMainWindow::BootGame(std::string filename) | 159 | void GMainWindow::BootGame(std::string filename) |
| 160 | { | 160 | { |
| 161 | NOTICE_LOG(MASTER_LOG, "Citra starting...\n"); | 161 | LOG_INFO(Frontend, "Citra starting...\n"); |
| 162 | System::Init(render_window); | 162 | System::Init(render_window); |
| 163 | 163 | ||
| 164 | if (Core::Init()) { | 164 | if (Core::Init()) { |
| 165 | ERROR_LOG(MASTER_LOG, "Core initialization failed, exiting..."); | 165 | LOG_CRITICAL(Frontend, "Core initialization failed, exiting..."); |
| 166 | Core::Stop(); | 166 | Core::Stop(); |
| 167 | exit(1); | 167 | exit(1); |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | // Load a game or die... | 170 | // Load a game or die... |
| 171 | if (Loader::ResultStatus::Success != Loader::LoadFile(filename)) { | 171 | if (Loader::ResultStatus::Success != Loader::LoadFile(filename)) { |
| 172 | ERROR_LOG(BOOT, "Failed to load ROM!"); | 172 | LOG_CRITICAL(Frontend, "Failed to load ROM!"); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | disasmWidget->Init(); | 175 | disasmWidget->Init(); |
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 80dc67d7d..9672168f5 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp | |||
| @@ -244,7 +244,7 @@ QValidator::State CSpinBox::validate(QString& input, int& pos) const | |||
| 244 | if (strpos >= input.length() - HasSign() - suffix.length()) | 244 | if (strpos >= input.length() - HasSign() - suffix.length()) |
| 245 | return QValidator::Intermediate; | 245 | return QValidator::Intermediate; |
| 246 | 246 | ||
| 247 | _dbg_assert_(GUI, base <= 10 || base == 16); | 247 | _dbg_assert_(Frontend, base <= 10 || base == 16); |
| 248 | QString regexp; | 248 | QString regexp; |
| 249 | 249 | ||
| 250 | // Demand sign character for negative ranges | 250 | // Demand sign character for negative ranges |