widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1644553-buildhelp-button into lp:widelands.

Commit message:
Revert to calling raw delete for FieldActionWindow.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1644553-buildhelp-button/+merge/312429

I had totally forgotten that I touched this when doing the toolbar cleanup, so this was missed.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1644553-buildhelp-button into lp:widelands.

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2016-11-26 07:58:59 +0000
+++ src/wui/fieldaction.cc	2016-12-04 18:16:22 +0000
@@ -735,7 +735,7 @@
 	// Force closing of old fieldaction windows. This is necessary because
 	// show_field_action() does not always open a FieldActionWindow (e.g.
 	// connecting the road we are building to an existing flag)
-	registry->destroy();
+	delete registry->window;
 	*registry = UI::UniqueWindow::Registry();
 
 	if (!ibase->is_building_road()) {

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2016-12-01 17:35:34 +0000
+++ src/wui/interactive_player.cc	2016-12-04 18:16:22 +0000
@@ -137,7 +137,8 @@
 					//  we are already in roadbuilding mode from the call below.
 					//  That is not allowed. Therefore we must delete the
 					//  fieldaction window before entering roadbuilding mode here.
-					fieldaction_.destroy();
+					delete fieldaction_.window;
+					fieldaction_.window = nullptr;
 					warp_mouse_to_node(flag_to_connect_);
 					set_sel_pos(Widelands::NodeAndTriangle<>(
 					   flag_to_connect_,