From 894a38f6c7dfe28d98f7ac113d45e2baa0e04df7 Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Thu, 31 Mar 2016 20:40:42 -0400 Subject: [PATCH] Fix empty popup when no lan server detected --- src/network/servers_manager.cpp | 2 ++ src/online/xml_request.hpp | 9 +++++---- src/states_screens/server_selection.cpp | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/network/servers_manager.cpp b/src/network/servers_manager.cpp index 3c45b594a..ba360cf3d 100644 --- a/src/network/servers_manager.cpp +++ b/src/network/servers_manager.cpp @@ -191,6 +191,8 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const m_success = true; } // if received_data } // while still waiting + if (!m_success) + m_info = _("No LAN server detected"); } // operation // -------------------------------------------------------------------- /** This function is necessary, otherwise the XML- and HTTP-Request diff --git a/src/online/xml_request.hpp b/src/online/xml_request.hpp index e6b0be3f3..ce7533def 100644 --- a/src/online/xml_request.hpp +++ b/src/online/xml_request.hpp @@ -42,11 +42,12 @@ namespace Online /** On a successful download contains the converted XML tree. */ XMLNode *m_xml_data; - /** Additional info contained the downloaded data (or an error - * message if a problem occurred). */ - irr::core::stringw m_info; - protected: + + /** Additional info contained the downloaded data (or an error + * message if a problem occurred). */ + irr::core::stringw m_info; + /** True if the request was successful executed on the server. */ bool m_success; diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp index 86e5c9e0b..330ede457 100644 --- a/src/states_screens/server_selection.cpp +++ b/src/states_screens/server_selection.cpp @@ -221,6 +221,7 @@ void ServerSelection::onUpdate(float dt) { SFXManager::get()->quickSound("anvil"); new MessageDialog(m_refresh_request->getInfo()); + m_server_list_widget->clear(); } delete m_refresh_request; m_refresh_request = NULL;