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

Remove unneeded previous unjoin because request is executed one by one

Browse Source
This commit is contained in:
Benau 2020-02-28 20:27:26 +08:00
parent 9a7dcf8d8b
commit eff00140f1
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/protocols/client_lobby.cpp
View File

@ -121,7 +121,6 @@ ClientLobby::~ClientLobby()
NetworkConfig::get()->setServerDetails(request, NetworkConfig::get()->setServerDetails(request,
"clear-user-joined-server"); "clear-user-joined-server");
request->queue(); request->queue();
ConnectToServer::m_previous_unjoin = request;
} }
} // ClientLobby } // ClientLobby

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

@ -58,7 +58,6 @@
#include <algorithm> #include <algorithm>
// ============================================================================ // ============================================================================
std::weak_ptr<Online::Request> ConnectToServer::m_previous_unjoin;
ENetAddress ConnectToServer::m_server_address; ENetAddress ConnectToServer::m_server_address;
int ConnectToServer::m_retry_count = 0; int ConnectToServer::m_retry_count = 0;
bool ConnectToServer::m_done_intecept = false; bool ConnectToServer::m_done_intecept = false;
@ -87,7 +86,6 @@ ConnectToServer::~ConnectToServer()
NetworkConfig::get()->setServerDetails(request, NetworkConfig::get()->setServerDetails(request,
"clear-user-joined-server"); "clear-user-joined-server");
request->queue(); request->queue();
m_previous_unjoin = request;
} }
} // ~ConnectToServer } // ~ConnectToServer
@ -472,14 +470,7 @@ bool ConnectToServer::tryConnect(int timeout, int retry, bool another_port,
void ConnectToServer::registerWithSTKServer() void ConnectToServer::registerWithSTKServer()
{ {
// Our public address is now known, register details with // Our public address is now known, register details with
// STK server. If previous unjoin request is not finished, wait // STK server
if (!m_previous_unjoin.expired())
{
if (ProtocolManager::lock()->isExiting())
return;
StkTime::sleep(1);
}
const SocketAddress& addr = STKHost::get()->getPublicAddress(); const SocketAddress& addr = STKHost::get()->getPublicAddress();
auto request = std::make_shared<Online::XMLRequest>(); auto request = std::make_shared<Online::XMLRequest>();
NetworkConfig::get()->setServerDetails(request, "join-server-key"); NetworkConfig::get()->setServerDetails(request, "join-server-key");

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

@ -62,7 +62,6 @@ private:
static bool m_done_intecept; static bool m_done_intecept;
bool detectPort(); bool detectPort();
public: public:
static std::weak_ptr<Online::Request> m_previous_unjoin;
ConnectToServer(std::shared_ptr<Server> server); ConnectToServer(std::shared_ptr<Server> server);
virtual ~ConnectToServer(); virtual ~ConnectToServer();
virtual void setup() OVERRIDE; virtual void setup() OVERRIDE;