From a142e4f4b2256e7c4a16d14aecde6e04be33457c Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 30 Dec 2015 00:50:50 +0100 Subject: [PATCH] Fix client crashing when connecting to server My commit e2d54c9f9275e4f77ec33be8054621d42945f7a4 "shutdown when requested from lua in singleplayer too" broke minetest's feature to connect to servers. The client crashed after the connection init was complete. Thanks to @sofar for reporting the bug. Fixes #3498. --- src/game.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game.cpp b/src/game.cpp index 25424fa26..7ada1791e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1818,7 +1818,7 @@ void Game::run() while (device->run() && !(*kill || g_gamecallback->shutdown_requested - || server->getShutdownRequested())) { + || (server && server->getShutdownRequested()))) { /* Must be called immediately after a device->run() call because it * uses device->getTimer()->getTime() -- 2.25.1