Compare commits

..

2 Commits

Author SHA1 Message Date
SmookeFR
03341861c2 Merge 35f022ba5c into 37041ea12c 2018-04-06 15:14:07 +00:00
SmookeFR
35f022ba5c assert: do not crash on unimplemented code in debug build
port from https://github.com/citra-emu/citra/pull/3474
2018-04-06 17:13:04 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -52,5 +52,5 @@ __declspec(noinline, noreturn)
#define DEBUG_ASSERT_MSG(_a_, _desc_, ...)
#endif
#define UNIMPLEMENTED() DEBUG_ASSERT_MSG(false, "Unimplemented code!")
#define UNIMPLEMENTED() LOG_CRITICAL(Debug, "Unimplemented code!")
#define UNIMPLEMENTED_MSG(...) ASSERT_MSG(false, __VA_ARGS__)

View File

@@ -347,6 +347,8 @@ bool GMainWindow::LoadROM(const QString& filename) {
const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())};
Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt");
if (result != Core::System::ResultStatus::Success) {
switch (result) {
case Core::System::ResultStatus::ErrorGetLoader:
@@ -407,7 +409,6 @@ bool GMainWindow::LoadROM(const QString& filename) {
}
return false;
}
Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt");
return true;
}