Fixed the unit_creator crash part of bug #24439

wesnoth · Feb 27, 2016 · f4cb656 · f4cb656
1 parent 2732b21
commit f4cb656
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/actions/unit_creator.cpp b/src/actions/unit_creator.cpp
@@ -217,7 +217,10 @@ void unit_creator::post_create(const map_location &loc, const unit &new_unit, bo
 		}
 	}
 
-	resources::game_events->pump().fire("unit placed", loc);
+	// Only fire the events if it's safe; it's not if we're in the middle of play_controller::reset_gamestate()
+	if (resources::lua_kernel != NULL) {
+		resources::game_events->pump().fire("unit placed", loc);
+	}
 
 	if (resources::screen!=NULL) {