From 1b24c3ab8e1c9d240a0ef1044fd0d415a27abf78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hrub=C3=BD?= <hrubymar10@gmail.com>
Date: Sat, 23 Feb 2019 14:31:23 +0100
Subject: [PATCH] Fix game crash when user click on Cancel while connecting to
 add-ons server from multiplayer lobby

Fixes issue #3859

(cherry picked from commit 856183067f0999e228338c4ebf402165b198fbf6)
---
 src/gui/dialogs/multiplayer/lobby.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/dialogs/multiplayer/lobby.cpp b/src/gui/dialogs/multiplayer/lobby.cpp
index 33507f125a22..53973f467567 100644
--- a/src/gui/dialogs/multiplayer/lobby.cpp
+++ b/src/gui/dialogs/multiplayer/lobby.cpp
@@ -36,6 +36,7 @@
 #include "gui/widgets/toggle_panel.hpp"
 #include "gui/widgets/tree_view_node.hpp"
 
+#include "addon/client.hpp"
 #include "addon/manager_ui.hpp"
 #include "chat_log.hpp"
 #include "font/text_formatting.hpp"
@@ -242,7 +243,11 @@ bool handle_addon_requirements_gui(const std::vector<mp::game_info::required_add
 
 		if(gui2::show_message(e_title, err_msg, message::yes_no_buttons, true) == gui2::retval::OK) {
 			// Begin download session
-			return ad_hoc_addon_fetch_session(needs_download);
+			try {
+				return ad_hoc_addon_fetch_session(needs_download);
+			} catch (const addons_client::user_exit&) {
+			} catch (const addons_client::user_disconnect&) {
+			}
 		}
 	}