Skip to content

Commit

Permalink
pull remote user input even if we are doing a local choice.
Browse files Browse the repository at this point in the history
this mainly effects wesnoth.synchronize_choices:
previously the client would not process incoming choices from other
players while it was exeucting its own local choice (usually a dialog).
The problem this commit fixes is that with the old behaviour any choice
from another player would block the incoming queue, in particular
chatmessages after that command would be delayed until the
wesnoth.synchronize_choices is finished.
  • Loading branch information
gfgtdf committed Mar 31, 2018
1 parent a32d689 commit edd7a82
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/synced_user_choice.cpp
Expand Up @@ -424,7 +424,7 @@ std::map<int, config> user_choice_manager::get_user_choice_internal(const std::s

void user_choice_manager::process(events::pump_info&)
{
if(waiting())
if(!oos_ && !finished())
{
pull();
}
Expand Down

0 comments on commit edd7a82

Please sign in to comment.