From bac776439bf6775169bc71568d745b43d9a06f5b Mon Sep 17 00:00:00 2001 From: muemart Date: Sat, 9 Dec 2017 15:59:21 +0100 Subject: [PATCH] Fix crash when loading an unsupported file. The telemetry stuff isn't properly initialized when loading fails, resulting in a crash. --- src/citra_qt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 14dd8b553..af7b8cf7b 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -487,8 +487,6 @@ 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: @@ -544,6 +542,8 @@ bool GMainWindow::LoadROM(const QString& filename) { } return false; } + + Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt"); return true; }