Permalink
Browse files

Don't lock controller when 'use map settings' is unchecked.

This partially fixes #21978.
  • Loading branch information...
1 parent 28d2c9e commit 87b3ba53771feb6ea12148280077e35a999f1b65 @thunderstruck thunderstruck committed Jun 20, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/multiplayer_connect_engine.cpp
@@ -845,7 +845,7 @@ side_engine::side_engine(const config& cfg, connect_engine& parent_engine,
allow_player_(cfg["allow_player"].to_bool(true)),
allow_changes_(!parent_.params_.saved_game && cfg["allow_changes"].to_bool(true)),
controller_lock_(cfg["controller_lock"].to_bool(
- parent_.force_lock_settings_)),
+ parent_.force_lock_settings_) && parent_.params_.use_map_settings),
index_(index),
team_(0),
color_(index),

0 comments on commit 87b3ba5

Please sign in to comment.