diff options
| author | bunnei <bunneidev@gmail.com> | 2019-10-18 10:50:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 10:50:01 -0400 |
| commit | 536d34fc71579ae3651d659bcb951fb2b457323e (patch) | |
| tree | c0ce48b7102eef1ad4b8a88049231126866c31b3 /src/core/core.cpp | |
| parent | 7f30ab07ba2bfa4fbc6ec657c2e591ed3df69dde (diff) | |
| parent | 47765b4d610b2d6492629eec1e9f13b4db25f86f (diff) | |
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 a30253c50c..9612e4bca6 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -240,16 +240,18 @@ struct System::Impl { } void Shutdown() { - // Log last frame performance stats - const auto perf_results = GetAndResetPerfStats(); - telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", - perf_results.emulation_speed * 100.0); - telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", - perf_results.game_fps); - telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", - perf_results.frametime * 1000.0); - telemetry_session->AddField(Telemetry::FieldType::Performance, "Mean_Frametime_MS", - perf_stats->GetMeanFrametime()); + // Log last frame performance stats if game was loded + if (perf_stats) { + const auto perf_results = GetAndResetPerfStats(); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_EmulationSpeed", + perf_results.emulation_speed * 100.0); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Framerate", + perf_results.game_fps); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Shutdown_Frametime", + perf_results.frametime * 1000.0); + telemetry_session->AddField(Telemetry::FieldType::Performance, "Mean_Frametime_MS", + perf_stats->GetMeanFrametime()); + } lm_manager.Flush(); |