# HG changeset patch
# User PeterN <peter@fuzzle.org>
# Date 2019-03-25 19:30:23
# Node ID 3254c23c07c910f60e92af8d9d93c48ff213af98
# Parent  70c31d6af4a9ac688add528a16cc68ec5aeb5435

Fix #7411: Use industry production callback (if used) on initial industry cargo generation. (#7412)

diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1751,8 +1751,16 @@ static void DoCreateNewIndustry(Industry
 	}
 
 	if (_generating_world) {
+		if (HasBit(indspec->callback_mask, CBM_IND_PRODUCTION_256_TICKS)) {
+			IndustryProductionCallback(i, 1);
+			for (size_t ci = 0; ci < lengthof(i->last_month_production); ci++) {
+				i->last_month_production[ci] = i->produced_cargo_waiting[ci] * 8;
+				i->produced_cargo_waiting[ci] = 0;
+			}
+		}
+
 		for (size_t ci = 0; ci < lengthof(i->last_month_production); ci++) {
-			i->last_month_production[ci] = i->production_rate[ci] * 8;
+			i->last_month_production[ci] += i->production_rate[ci] * 8;
 		}
 	}