From 13013d1b8b3faba518806400f8261d24d4020c26 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 19 Jan 2024 20:14:54 +0100
Subject: [PATCH] Fix client loading not aborting correctly in certain cases

---
 src/client/game.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/game.cpp b/src/client/game.cpp
index d84c493a7..1e62b4b7c 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1743,7 +1743,7 @@ bool Game::getServerContent(bool *aborted)
 		// End condition
 		if (client->mediaReceived() && client->itemdefReceived() &&
 				client->nodedefReceived()) {
-			break;
+			return true;
 		}
 
 		// Error conditions
@@ -1802,7 +1802,9 @@ bool Game::getServerContent(bool *aborted)
 		}
 	}
 
-	return true;
+	*aborted = true;
+	infostream << "Connect aborted [device]" << std::endl;
+	return false;
 }