From 95a2d1f90772e74ca81a282835656e3730dcaffe Mon Sep 17 00:00:00 2001 From: yexo Date: Fri, 10 Sep 2010 13:50:47 +0000 Subject: (svn r20781) -Fix (r20780): FinishInitNested reset this->owner, so set it afterwards --- src/group_gui.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/group_gui.cpp b/src/group_gui.cpp index da3eb452a..f076e3284 100644 --- a/src/group_gui.cpp +++ b/src/group_gui.cpp @@ -191,10 +191,9 @@ public: 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(GRP_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vli.vtype; @@ -206,6 +205,7 @@ public: this->GetWidget(GRP_WIDGET_REPLACE_PROTECTION)->widget_data += this->vli.vtype; this->FinishInitNested(desc, window_number); + this->owner = vli.company; } ~VehicleGroupWindow() @@ -301,7 +301,7 @@ public: this->BuildVehicleList(); this->SortVehicleList(); - this->BuildGroupList(owner); + this->BuildGroupList(this->owner); this->groups.Sort(&GroupNameSorter); this->group_sb->SetCount(this->groups.Length()); -- cgit v1.2.3-70-g09d2