Merge lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

[GunChleoc]

Close the building window when dismantling a building.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3885. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/423896050.
Appveyor build 3683. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1669103_no_automatic_dismantlesitewindow-3683.

[Notabilis (notabilis27)]

Code is looking good and testing works as intended.

review: Approve (diff, testing)

[GunChleoc (gunchleoc)]

Thanks for the review :)

@bunnybot merge

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2018-07-26 11:24:49 +0000
+++ src/logic/player.cc	2018-09-12 06:04:18 +0000
@@ -743,8 +743,10 @@
 			workers = building->get_workers();
 		}
 
-		// Register whether the window was open
-		Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kStartWarp));
+		if (index_of_new_building != INVALID_INDEX) {
+			// For enhancing, register whether the window was open
+			Notifications::publish(NoteBuilding(building->serial(), NoteBuilding::Action::kStartWarp));
+		}
 		building->remove(egbase());  //  no fire or stuff
 		//  Hereafter the old building does not exist and building is a dangling
 		//  pointer.