Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 18:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix client crash on when con::PeerNotFoundException is thrown (#11286)

Browse Source
This commit is contained in:
savilli 2021-05-24 19:40:35 +02:00 committed by GitHub
parent 93f43c890b
commit 673c29f7ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/clientlauncher.cpp
View File

@ -277,14 +277,6 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
chat_backend, chat_backend,
&reconnect_requested &reconnect_requested
); );
m_rendering_engine->get_scene_manager()->clear();
#ifdef HAVE_TOUCHSCREENGUI
delete g_touchscreengui;
g_touchscreengui = NULL;
receiver->m_touchscreengui = NULL;
#endif
} //try } //try
catch (con::PeerNotFoundException &e) { catch (con::PeerNotFoundException &e) {
error_message = gettext("Connection error (timed out?)"); error_message = gettext("Connection error (timed out?)");
@ -300,6 +292,14 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
} }
#endif #endif
m_rendering_engine->get_scene_manager()->clear();
#ifdef HAVE_TOUCHSCREENGUI
delete g_touchscreengui;
g_touchscreengui = NULL;
receiver->m_touchscreengui = NULL;
#endif
// If no main menu, show error and exit // If no main menu, show error and exit
if (skip_main_menu) { if (skip_main_menu) {
if (!error_message.empty()) { if (!error_message.empty()) {