upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 01:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP Manager: avoid setting singleton ptr until connection is established

Browse Source
This commit is contained in:
Charles Dang 2021-02-08 10:38:40 +11:00
parent 1f7a0e2a13
commit cd120f5118
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game_initialization/multiplayer.cpp
View File

@ -160,9 +160,6 @@ mp_manager::mp_manager(const std::optional<std::string> host)
, state() , state()
, lobby_info(::installed_addons()) , lobby_info(::installed_addons())
{ {
assert(!manager);
manager = this;
state.classification().campaign_type = game_classification::CAMPAIGN_TYPE::MULTIPLAYER; state.classification().campaign_type = game_classification::CAMPAIGN_TYPE::MULTIPLAYER;
if(host) { if(host) {
@ -214,6 +211,11 @@ mp_manager::mp_manager(const std::optional<std::string> host)
received_initial_gamelist.get_future().wait(); received_initial_gamelist.get_future().wait();
}); });
} }
// Avoid setting this until the connection has been fully established. open_connection may throw,
// in which case we don't want to point to an object instance that has not properly connected.
assert(!manager);
manager = this;
} }
std::unique_ptr<wesnothd_connection> mp_manager::open_connection(std::string host) std::unique_ptr<wesnothd_connection> mp_manager::open_connection(std::string host)