ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show error message from stk addons server if failing to join server

Browse Source 
Translation is thread-safe now so it no longer needs constructor setup
This commit is contained in:
Benau 2020-08-26 00:38:19 +08:00
parent 5348876205
commit 4b9a84eeba
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/network/protocols/connect_to_server.cpp
View File

@ -74,7 +74,6 @@ bool ConnectToServer::m_done_intecept = false;
ConnectToServer::ConnectToServer(std::shared_ptr<Server> server) ConnectToServer::ConnectToServer(std::shared_ptr<Server> server)
: Protocol(PROTOCOL_CONNECTION) : Protocol(PROTOCOL_CONNECTION)
{ {
m_quick_play_err_msg = _("No quick play server available.");
m_server_address = {}; m_server_address = {};
if (server) if (server)
m_server = server; m_server = server;
@ -220,7 +219,7 @@ void ConnectToServer::asynchronousUpdate()
else else
{ {
// Shutdown STKHost (go back to online menu too) // Shutdown STKHost (go back to online menu too)
STKHost::get()->setErrorMessage(m_quick_play_err_msg); STKHost::get()->setErrorMessage(_("No quick play server available."));
STKHost::get()->requestShutdown(); STKHost::get()->requestShutdown();
m_state = EXITING; m_state = EXITING;
return; return;
@ -369,8 +368,14 @@ void ConnectToServer::update(int ticks)
if (STKHost::get()->getPeerCount() == 0) if (STKHost::get()->getPeerCount() == 0)
{ {
// Shutdown STKHost (go back to online menu too) // Shutdown STKHost (go back to online menu too)
STKHost::get()->setErrorMessage( core::stringw err =
_("Cannot connect to server %s.", m_server->getName())); _("Cannot connect to server %s.", m_server->getName());
if (!m_error_msg.empty())
{
err += L"\n";
err += m_error_msg;
}
STKHost::get()->setErrorMessage(err);
STKHost::get()->requestShutdown(); STKHost::get()->requestShutdown();
} }
requestTerminate(); requestTerminate();
@ -515,9 +520,9 @@ bool ConnectToServer::registerWithSTKServer()
} }
else else
{ {
irr::core::stringc error(request->getInfo().c_str()); m_error_msg = request->getInfo();
Log::error("ConnectToServer", "Failed to register client address: %s", Log::error("ConnectToServer", "Failed to register client address: %s",
error.c_str()); StringUtils::wideToUtf8(m_error_msg).c_str());
return false; return false;
} }
} // registerWithSTKServer } // registerWithSTKServer

2
src/network/protocols/connect_to_server.hpp
View File

@ -40,7 +40,7 @@ class ConnectToServer : public Protocol
private: private:
std::shared_ptr<Server> m_server; std::shared_ptr<Server> m_server;
irr::core::stringw m_quick_play_err_msg; irr::core::stringw m_error_msg;
/** State for finite state machine. */ /** State for finite state machine. */
enum ConnectState : unsigned int enum ConnectState : unsigned int