0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary heap allocation

Browse source
This commit is contained in:
Jyrki Vesterinen 2018-06-30 09:47:37 +03:00
parent fa01fb14d2
commit 3a5c2df0a1
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/dialogs/multiplayer/mp_join_game.cpp
View file

@ -311,16 +311,11 @@ bool mp_join_game::show_flg_select(int side_num)
ng::flg_manager flg(era_factions, side_choice, lock_settings, use_map_settings, saved_game);
{
// Create a new Faction Select dialog. We use a smart pointer here instead of creating
// a new scoped object on the stack since other functions (such as network_handler())
// need to acces the dialog object while its open.
flg_dialog_.reset(new gui2::dialogs::faction_select(flg, color, side_num));
gui2::dialogs::faction_select flg_dialog(flg, color, side_num);
flg_dialog_ = &flg_dialog;
utils::scope_exit se([this]() { flg_dialog_ = nullptr; });
// Destroy the dialog object completely on scope exit.
// Using scope_exit ensured this happens even if the dialog throws an exception.
utils::scope_exit se([this]() { flg_dialog_.reset(); });
if(!flg_dialog_->show()) {
if(!flg_dialog.show()) {
return true;
}
}

2
src/gui/dialogs/multiplayer/mp_join_game.hpp
View file

@ -88,7 +88,7 @@ private:
std::unique_ptr<player_list_helper> player_list_;
std::unique_ptr<class faction_select> flg_dialog_;
faction_select* flg_dialog_;
};
} // namespace dialogs