Merge lp:~widelands-dev/widelands/bug-1735967-productionsitewindow into lp:widelands

[GunChleoc]

Productionsite windows no longer handle their notifications when they are dying. This will hopefully fix a use-after-free when the worker table is updated while the window is being closed.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2947. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/314698452.
Appveyor build 2756. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1735967_productionsitewindow-2756.

[TiborB (tiborb95)]

Code looks good to me. Only indentation seems be shifted to the right, at least here on this page

review: Approve

[GunChleoc (gunchleoc)]

Yes, QTCreator annoyingly does that, and I haven't found a setting to make it behave. Bunnybot will fix it for us though :)

@bunnybot merge

=== modified file 'src/wui/productionsitewindow.cc'
--- src/wui/productionsitewindow.cc	2017-11-30 20:56:22 +0000
+++ src/wui/productionsitewindow.cc	2017-12-11 09:54:02 +0000
@@ -48,6 +48,9 @@
      worker_caps_(nullptr) {
 	productionsitenotes_subscriber_ = Notifications::subscribe<Widelands::NoteBuilding>(
 	   [this](const Widelands::NoteBuilding& note) {
+			if (is_dying_) {
+				return;
+			}
 		   Widelands::ProductionSite* production_site = production_site_.get(igbase()->egbase());
 		   if (production_site == nullptr) {
 			   return;