Reverted #d1a713a587015c6deca44acc0a614a9fbeed723e

The commit fixed bug #bug #21450 but introduced a new one: The end
scenari button was disabled thus players can't reach the next scenario
any longer.
This commit is contained in:
fendrin 2014-02-07 19:55:03 +01:00
parent a8be318b66
commit 4f50ef2be8
4 changed files with 6 additions and 4 deletions

View file

@ -38,7 +38,6 @@ Version 1.11.8+dev:
* Team color is now applied on the Unknown unit icon in the game Status
Table regardless of whether the side's leader unit supports team color.
* Miscellaneous and bug fixes:
* Properly disabled commands in linger mode (bug #21450)
* Added -Wno-documentation-deprecated-sync to the CMake pedantic flags.
* Fixed several Doxygen issues found by Clang 3.4.
* Fixed possible invalid memory access issue in the MP sides configuration

View file

@ -28,7 +28,6 @@ Version 1.11.8+dev:
Table regardless of whether the side's leader unit supports team color.
* Miscellaneous and bug fixes:
* Properly disabled commands in linger mode (bug #21450)
* Fixed possible invalid memory access issue in the MP sides configuration
code causing crashes for some users (bug #21449).
* Fixed broken image references in the Gameplay -> Time of Day help topic.

View file

@ -275,7 +275,9 @@ void playmp_controller::reset_end_scenario_button()
void playmp_controller::linger()
{
LOG_NG << "beginning end-of-scenario linger\n";
const events::command_disabler disable_commands;
// TODO this seemed the right way to handle bug #21450
// but it is causing to end scenario button to be disabled
//const events::command_disabler disable_commands;
browse_ = true;
linger_ = true;
// If we need to set the status depending on the completion state

View file

@ -752,7 +752,9 @@ struct set_completion
void playsingle_controller::linger()
{
LOG_NG << "beginning end-of-scenario linger\n";
const events::command_disabler disable_commands;
// TODO this seemed the right way to handle bug #21450
// but it is causing to end scenario button to be disabled
//const events::command_disabler disable_commands;
browse_ = true;
linger_ = true;