diff options
| author | 2018-04-07 16:48:47 -0400 | |
|---|---|---|
| committer | 2018-04-07 16:48:47 -0400 | |
| commit | d79558a6f0dda96c5f0d8ac3ac782dd92ffb8b98 (patch) | |
| tree | aa4455c9353ee25d69d8742a804b28a8f1324798 /src | |
| parent | Merge pull request #310 from N00byKing/patch-1 (diff) | |
| parent | Prevent crash from uninitialized telemetry (diff) | |
| download | yuzu-d79558a6f0dda96c5f0d8ac3ac782dd92ffb8b98.tar.gz yuzu-d79558a6f0dda96c5f0d8ac3ac782dd92ffb8b98.tar.xz yuzu-d79558a6f0dda96c5f0d8ac3ac782dd92ffb8b98.zip | |
Merge pull request #316 from jroweboy/dontcrash
Prevent crash from uninitialized telemetry
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 936a2759b..34e33170e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -347,8 +347,6 @@ bool GMainWindow::LoadROM(const QString& filename) { | |||
| 347 | 347 | ||
| 348 | const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())}; | 348 | const Core::System::ResultStatus result{system.Load(render_window, filename.toStdString())}; |
| 349 | 349 | ||
| 350 | Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt"); | ||
| 351 | |||
| 352 | if (result != Core::System::ResultStatus::Success) { | 350 | if (result != Core::System::ResultStatus::Success) { |
| 353 | switch (result) { | 351 | switch (result) { |
| 354 | case Core::System::ResultStatus::ErrorGetLoader: | 352 | case Core::System::ResultStatus::ErrorGetLoader: |
| @@ -409,6 +407,7 @@ bool GMainWindow::LoadROM(const QString& filename) { | |||
| 409 | } | 407 | } |
| 410 | return false; | 408 | return false; |
| 411 | } | 409 | } |
| 410 | Core::Telemetry().AddField(Telemetry::FieldType::App, "Frontend", "Qt"); | ||
| 412 | return true; | 411 | return true; |
| 413 | } | 412 | } |
| 414 | 413 | ||