Author: ilor
Date: Tue Nov 25 00:56:28 2008
New Revision: 31069
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31069&view=rev
Log:
backport r31086 to 1.4 (bugfix for bug #12453 prsent both in 1.4 and trunk)
Modified:
branches/1.4/src/playsingle_controller.cpp
Modified: branches/1.4/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.4/src/playsingle_controller.cpp?rev=31069&r1=31068&r2=31069&view=diff
==============================================================================
--- branches/1.4/src/playsingle_controller.cpp (original)
+++ branches/1.4/src/playsingle_controller.cpp Tue Nov 25 00:56:28 2008
@@ -757,7 +757,8 @@
return (!browse_ || linger_) &&
!events::commands_disabled;
case hotkey::HOTKEY_DELAY_SHROUD:
- return !linger_ && (current_team().uses_fog() ||
current_team().uses_shroud());
+ return !linger_ && (current_team().uses_fog() ||
current_team().uses_shroud())
+ && !events::commands_disabled;
case hotkey::HOTKEY_UPDATE_SHROUD:
return !linger_ && !events::commands_disabled &&
current_team().auto_shroud_updates() == false;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits