MP Staging/Join Game: disable Esc existing (fixes #3601)
This commit is contained in:
parent
64279eb4a3
commit
34bb081643
3 changed files with 4 additions and 1 deletions
|
@ -125,6 +125,7 @@
|
|||
* Game Load screen gracefully handles savefiles that can't be parsed. (issue #3652)
|
||||
* The sidebar now shows alignment and damages as they would be on the hex under
|
||||
the mouse, rather than at the unit's current location. (PR #3642)
|
||||
* Fixed being able to dismiss a game lobby by pressing Esc.
|
||||
|
||||
## Version 1.14.5
|
||||
### AI
|
||||
|
|
|
@ -224,6 +224,7 @@ static std::string generate_user_description(const config& side)
|
|||
void mp_join_game::pre_show(window& window)
|
||||
{
|
||||
window.set_enter_disabled(true);
|
||||
window.set_escape_disabled(true);
|
||||
|
||||
//
|
||||
// Set title
|
||||
|
@ -450,7 +451,7 @@ void mp_join_game::generate_side_list(window& window)
|
|||
//
|
||||
const auto handler = [this, side_num](bool& handled, bool& halt) {
|
||||
show_flg_select(side_num);
|
||||
// note: this function is called from a std::function object stored in the widget
|
||||
// note: this function is called from a std::function object stored in the widget
|
||||
// and show_flg_select which internally calls
|
||||
// show_dialog -> pump -> ... -> network_handler -> ... -> generate_side_list
|
||||
// might destroy that std::function object while it is executed, this means that
|
||||
|
|
|
@ -73,6 +73,7 @@ mp_staging::~mp_staging()
|
|||
void mp_staging::pre_show(window& window)
|
||||
{
|
||||
window.set_enter_disabled(true);
|
||||
window.set_escape_disabled(true);
|
||||
|
||||
//
|
||||
// Set title and status widget states
|
||||
|
|
Loading…
Add table
Reference in a new issue