From 9704acb982eb3dfb4b2b6a090f5613d4ac57b196 Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Tue, 6 Dec 2022 16:13:42 -0500
Subject: general: improve handling of system startup failure

---
 src/core/core.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/core/core.cpp')

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 94d4e2212..a738f221f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -389,7 +389,9 @@ struct System::Impl {
         kernel.ShutdownCores();
         cpu_manager.Shutdown();
         debugger.reset();
-        services->KillNVNFlinger();
+        if (services) {
+            services->KillNVNFlinger();
+        }
         kernel.CloseServices();
         services.reset();
         service_manager.reset();
-- 
cgit v1.2.3