aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.cpp
diff options
context:
space:
mode:
authorNicolae-Andrei Cociorba <cociorbaandrei@gmail.com>2019-10-18 14:12:12 +0000
committerNicolae-Andrei Cociorba <cociorbaandrei@gmail.com>2019-10-18 14:12:12 +0000
commit20521da2592b95e97904cb9f6315e338ae503e25 (patch)
treec0ce48b7102eef1ad4b8a88049231126866c31b3 /src/core/core.cpp
parentdc5eedef7155a15558478fcae4ab31928008bf94 (diff)
Fix null pointer deref.
Diffstat (limited to 'src/core/core.cpp')
-rw-r--r--src/core/core.cpp22
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();