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

Don't allow returning to playing mode until the replay finishes (#2508)

Browse source 
This fixes an assertion failure I got while trying to reproduce #2508, and
is the fix @gfgtdf recommended.

Note that #2508 is a different bug (an unhandled exception rather than an
assertion failure) and this commit doesn't fix it.
This commit is contained in:
Jyrki Vesterinen 2018-02-19 19:21:03 +02:00
parent a3b513e8b8
commit dfbfd924fb
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hotkey/hotkey_handler_sp.cpp
View file

@ -294,7 +294,7 @@ bool playsingle_controller::hotkey_handler::can_execute_command(const hotkey::ho
case hotkey::HOTKEY_REPLAY_RESET:
return playsingle_controller_.get_replay_controller() && playsingle_controller_.get_replay_controller()->can_execute_command(cmd, index);
case hotkey::HOTKEY_REPLAY_EXIT:
return playsingle_controller_.is_replay();
return playsingle_controller_.is_replay() && (!playsingle_controller_.is_networked_mp() || resources::recorder->at_end());
default: return play_controller::hotkey_handler::can_execute_command(cmd, index);
}
return res;