From 6b9d2809b175bd7e5f12021f716d25eb3f0c16c3 Mon Sep 17 00:00:00 2001
From: Ivan Savenko <saven.ivan@gmail.com>
Date: Mon, 17 Jun 2024 13:23:44 +0000
Subject: [PATCH] Fix crash on Android OS shutdown request

---
 client/Client.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/Client.cpp b/client/Client.cpp
index 9312e228b..817fdd410 100644
--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -738,6 +738,13 @@ extern "C" JNIEXPORT jboolean JNICALL Java_eu_vcmi_vcmi_NativeMethods_tryToSaveT
 	logGlobal->info("Received emergency save game request");
 	if(!LOCPLINT || !LOCPLINT->cb)
 	{
+		logGlobal->info("... but no active player interface found!");
+		return false;
+	}
+
+	if (!CSH || !CSH->logicConnection)
+	{
+		logGlobal->info("... but no active connection found!");
 		return false;
 	}