Author: dfranke
Date: Mon Mar 30 08:53:24 2009
New Revision: 34278
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34278&view=rev
Log:
Add an input_blocker during init_turn(), closing various race windows. Please
observe a moment of silence for the long-awaited passing of bug #9496.
Modified:
branches/1.6/src/playsingle_controller.cpp
trunk/src/playsingle_controller.cpp
Modified: branches/1.6/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/playsingle_controller.cpp?rev=34278&r1=34277&r2=34278&view=diff
==============================================================================
--- branches/1.6/src/playsingle_controller.cpp (original)
+++ branches/1.6/src/playsingle_controller.cpp Mon Mar 30 08:53:24 2009
@@ -31,6 +31,7 @@
#include "sound.hpp"
#include "upload_log.hpp"
#include "formula_string_utils.hpp"
+#include "events.hpp"
#define ERR_NG LOG_STREAM(err, engine)
#define LOG_NG LOG_STREAM(info, engine)
@@ -529,6 +530,7 @@
skip_next_turn_ = false;
throw end_turn_exception();
}
+ input_blocker blocker;
init_side(player_number_ - 1);
} catch (end_turn_exception) {
if (current_team().is_network() == false) {
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=34278&r1=34277&r2=34278&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Mon Mar 30 08:53:24 2009
@@ -32,6 +32,7 @@
#include "sound.hpp"
#include "upload_log.hpp"
#include "formula_string_utils.hpp"
+#include "events.hpp"
#define ERR_NG LOG_STREAM(err, engine)
#define LOG_NG LOG_STREAM(info, engine)
@@ -530,6 +531,7 @@
skip_next_turn_ = false;
throw end_turn_exception();
}
+ input_blocker blocker;
init_side(player_number_ - 1);
} catch (end_turn_exception) {
if (current_team().is_network() == false) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
