diff options
| author |  bunnei | 2019-10-18 10:50:01 -0400 |
|---|---|---|
| committer |  GitHub | 2019-10-18 10:50:01 -0400 |
| commit | 8d009a7aae129ce7bc9b33e047f5344ebdc3ab92 (patch) | |
| tree | c0ce48b7102eef1ad4b8a88049231126866c31b3 /src/core/core.cpp | |
| parent | Merge pull request #2994 from lioncash/fmt (diff) | |
| parent | Fix null pointer deref. (diff) | |
| download | yuzu-8d009a7aae129ce7bc9b33e047f5344ebdc3ab92.tar.gz yuzu-8d009a7aae129ce7bc9b33e047f5344ebdc3ab92.tar.xz yuzu-8d009a7aae129ce7bc9b33e047f5344ebdc3ab92.zip | |
Merge pull request #2998 from cociorbaandrei/fix_null_pderef
Fix null pointer dereference.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index a30253c50..9612e4bca 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -240,16 +240,18 @@ struct System::Impl { | |||
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | void Shutdown() { | 242 | void Shutdown() { |
| 243 | // Log last frame performance stats | 243 | // Log last frame performance stats if game was loded |
| 244 | const auto perf_results = GetAndResetPerfStats(); | 244 | if (perf_stats) { |
| 245 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", | 245 | const auto perf_results = GetAndResetPerfStats(); |
| 246 | perf_results.emulation_speed * 100.0); | 246 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", |
| 247 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", | 247 | perf_results.emulation_speed * 100.0); |
| 248 | perf_results.game_fps); | 248 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", |
| 249 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", | 249 | perf_results.game_fps); |
| 250 | perf_results.frametime * 1000.0); | 250 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", |
| 251 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Mean_Frametime_MS", | 251 | perf_results.frametime * 1000.0); |
| 252 | perf_stats->GetMeanFrametime()); | 252 | telemetry_session->AddField(Telemetry::FieldType::Performance, "Mean_Frametime_MS", |
| 253 | perf_stats->GetMeanFrametime()); | ||
| 254 | } | ||
| 253 | 255 | ||
| 254 | lm_manager.Flush(); | 256 | lm_manager.Flush(); |
| 255 | 257 | ||