don't execute run_in_synced_context in replays.

wesnoth · Jun 10, 2014 · 1eee975 · 1eee975
1 parent 2b7da8f
commit 1eee975
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/synced_context.cpp b/src/synced_context.cpp
@@ -36,6 +36,14 @@ bool synced_context::is_simultaneously_ = false;
 bool synced_context::run_in_synced_context(const std::string& commandname, const config& data, bool use_undo, bool show,  bool store_in_replay, synced_command::error_handler_function error_handler)
 {
 	DBG_REPLAY << "run_in_synced_context:" << commandname << "\n";
+
+	if(!recorder.at_end())
+	{
+		//Most likeley we are in a replay now.
+		WRN_REPLAY << "invalid run_in_synced_context call ignored" << std::endl;
+		return false;
+	}
+
 	assert(use_undo || (!resources::undo_stack->can_redo() && !resources::undo_stack->can_undo()));
 	if(store_in_replay)
 	{