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

[noreply]

The proposal to merge 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

[GunChleoc]

Thanks for the review :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands

[Notabilis]

Review: Approve diff, testing

Code is looking good and testing works as intended.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

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

[bunnybot]

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.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

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

[GunChleoc]

GunChleoc has proposed merging 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands.

Commit message:
Close the building window when dismantling a building.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1669103 in widelands: "Confirming Dismantle building opens dismantle 
site window"
  https://bugs.launchpad.net/widelands/+bug/1669103

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into 
lp:widelands.
=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2018-07-26 11:24:49 +
+++ src/logic/player.cc	2018-09-03 10:38:29 +
@@ -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.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp