Don't end turn if executing all actions in another way than...

...using the "end turn" action. Fixes bug #19901.
This commit is contained in:
Gabriel Morin 2012-10-07 02:18:27 +00:00
parent e5da0cf3c9
commit 1e319ff73c

View file

@ -1005,7 +1005,7 @@ void manager::continue_execute_all()
{
if (executing_all_actions_ && !rand_rng::has_new_seed_callback()) {
events::commands_disabled--;
if (execute_all_actions()) {
if (execute_all_actions() && preparing_to_end_turn_) {
resources::controller->force_end_turn();
}
}