Merge lp:~widelands-dev/widelands/productionsite-inactivity-bug into lp:widelands

[Benedikt Straub]

Fix a bug where a building remains inactive after kicking a worker

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5333. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/573087985.
Appveyor build 5105. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_productionsite_inactivity_bug-5105.

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2019-08-13 11:12:56 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2019-08-17 11:14:10 +0000
@@ -776,6 +776,7 @@
 	Building::log_general_info(egbase);
 
 	molog("is_stopped: %u\n", is_stopped_);
+	molog("main_worker: %i\n", main_worker_);
 }
 
 void ProductionSite::set_stopped(bool const stopped) {
@@ -796,18 +797,17 @@
 }
 
 void ProductionSite::try_start_working(Game& game) {
-	if (main_worker_ >= 0) {
-		return;
-	}
 	const size_t nr_workers = descr().working_positions().size();
 	for (uint32_t i = 0; i < nr_workers; ++i) {
-		if (Worker* worker = working_positions_[i].worker) {
-			// We may start even if can_start_working() returns false, because basic actions
-			// like unloading extra wares should take place anyway
-			main_worker_ = i;
-			worker->reset_tasks(game);
-			worker->start_task_buildingwork(game);
-			return;
+		if (main_worker_ == static_cast<int>(i) || main_worker_ < 0) {
+			if (Worker* worker = working_positions_[i].worker) {
+				// We may start even if can_start_working() returns false, because basic actions
+				// like unloading extra wares should take place anyway
+				main_worker_ = i;
+				worker->reset_tasks(game);
+				worker->start_task_buildingwork(game);
+				return;
+			}
 		}
 	}
 }