Merge branch 'nx2' into nx2-experimental

# Conflicts:
#	src/video_core/nx2.h
#	src/video_core/renderer_vulkan/vk_texture_cache.cpp
#	src/video_core/texture_cache/texture_cache.h

1 files changed, 3 insertions, 0 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 3728ccf8f7..64e1d8de06 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -496,6 +496,9 @@ struct System::Impl {
     }
 
     PerfStatsResults GetAndResetPerfStats() {
+        if (!perf_stats) {
+            return {};
+        }
         return perf_stats->GetAndResetStats(core_timing.GetGlobalTimeUs());
     }