Mercurial > hg > openttd

changeset 16088:9980d312a536 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20781) -Fix (r20780): FinishInitNested reset this->owner, so set it afterwards
author yexo <yexo@openttd.org>
date Fri, 10 Sep 2010 13:50:47 +0000
parents c6df3f294204
children bcd4c4237502
files src/group_gui.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -191,10 +191,9 @@
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
-		this->owner = vli.company;
 		this->groups.ForceRebuild();
 		this->groups.NeedResort();
-		this->BuildGroupList(this->owner);
+		this->BuildGroupList(vli.company);
 		this->groups.Sort(&GroupNameSorter);
 
 		this->GetWidget<NWidgetCore>(GRP_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vli.vtype;
@@ -206,6 +205,7 @@
 		this->GetWidget<NWidgetCore>(GRP_WIDGET_REPLACE_PROTECTION)->widget_data += this->vli.vtype;
 
 		this->FinishInitNested(desc, window_number);
+		this->owner = vli.company;
 	}
 
 	~VehicleGroupWindow()
@@ -301,7 +301,7 @@
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
-		this->BuildGroupList(owner);
+		this->BuildGroupList(this->owner);
 		this->groups.Sort(&GroupNameSorter);
 
 		this->group_sb->SetCount(this->groups.Length());