From bdade9e49959b6727bf0b410c89667d7bd75b9e4 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Tue, 16 Jan 2024 22:45:50 +0100
Subject: [PATCH] planner: initialize subobject of PlannerWidgets in correct
 order

The DivePlannerWidget was initialized before the planner models.
However, it attaches these (non existing) models to the comboboxes.
That can't work. Initialize in correct order.

Fixes #4014

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 desktop-widgets/diveplanner.cpp | 4 ++--
 desktop-widgets/diveplanner.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index 3a3eeaf81..2431b09bb 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -542,11 +542,11 @@ void PlannerDetails::setPlanNotes(QString plan)
 
 PlannerWidgets::PlannerWidgets() :
 	planned_dive(alloc_dive()),
+	gasModel(std::make_unique<GasSelectionModel>()),
+	diveTypeModel(std::make_unique<DiveTypeSelectionModel>()),
 	plannerWidget(*planned_dive, this),
 	plannerSettingsWidget(this)
 {
-	gasModel = std::make_unique<GasSelectionModel>();
-	diveTypeModel = std::make_unique<DiveTypeSelectionModel>();
 	connect(plannerDetails.printPlan(), &QPushButton::pressed, this, &PlannerWidgets::printDecoPlan);
 	connect(DivePlannerPointsModel::instance(), &DivePlannerPointsModel::calculatedPlanNotes,
 		&plannerDetails, &PlannerDetails::setPlanNotes);
diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h
index d24e4c8c6..5fef8efcc 100644
--- a/desktop-widgets/diveplanner.h
+++ b/desktop-widgets/diveplanner.h
@@ -94,11 +94,11 @@ slots:
 public:
 	void repopulateGasModel();
 	OwningDivePtr planned_dive;
+	std::unique_ptr<GasSelectionModel> gasModel;
+	std::unique_ptr<DiveTypeSelectionModel> diveTypeModel;
 	DivePlannerWidget plannerWidget;
 	PlannerSettingsWidget plannerSettingsWidget;
 	PlannerDetails plannerDetails;
-	std::unique_ptr<GasSelectionModel> gasModel;
-	std::unique_ptr<DiveTypeSelectionModel> diveTypeModel;
 };
 
 #endif // DIVEPLANNER_H