Skip to content
Permalink
Browse files
Fix client crash on when con::PeerNotFoundException is thrown (#11286)
  • Loading branch information
savilli committed May 24, 2021
1 parent 93f43c8 commit 673c29f7ea6735c15596a118fe7e6100d4a466e0
Showing with 8 additions and 8 deletions.
  1. +8 −8 src/client/clientlauncher.cpp
@@ -277,14 +277,6 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
chat_backend,
&reconnect_requested
);
m_rendering_engine->get_scene_manager()->clear();

#ifdef HAVE_TOUCHSCREENGUI
delete g_touchscreengui;
g_touchscreengui = NULL;
receiver->m_touchscreengui = NULL;
#endif

} //try
catch (con::PeerNotFoundException &e) {
error_message = gettext("Connection error (timed out?)");
@@ -300,6 +292,14 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
}
#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 (skip_main_menu) {
if (!error_message.empty()) {

0 comments on commit 673c29f

Please sign in to comment.