Fix client loading not aborting correctly in certain cases

minetest · Jan 23, 2024 · 13013d1 · 13013d1
1 parent 6df0de5
commit 13013d1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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;
 }