Fix: New hiker wouldn't show up in add hiker dialog after creating from there

Author: svetter

src/dialogs/add_hiker_dialog.cpp

@@ -98,9 +98,11 @@ bool AddHikerDialog::hikerSelected()
 void AddHikerDialog::handle_newHiker()
 {
 	BufferRowIndex newHikerIndex = openNewHikerDialogAndStore(this, db);
-	if (newHikerIndex.isValid()) {
-		hikerCombo->setCurrentIndex(newHikerIndex.get() + 1);	// 0 is None
-	}
+	if (newHikerIndex.isInvalid()) return;
+	
+	populateItemCombo(db->hikersTable, db->hikersTable->nameColumn, true, hikerCombo, selectableHikerIDs);
+	const ValidItemID newHikerID = db->hikersTable->getPrimaryKeyAt(newHikerIndex);
+	hikerCombo->setCurrentIndex(selectableHikerIDs.indexOf(newHikerID) + 1);	// 0 is None
 }
 
 

src/dialogs/ascent_dialog.cpp

@@ -315,9 +315,9 @@ void AscentDialog::handle_newPeak()
 	if (newPeakIndex.isInvalid()) return;
 
 	populateItemCombo(db->peaksTable, db->peaksTable->nameColumn, true, peakCombo, selectablePeakIDs);
-	ValidItemID peakID = db->peaksTable->getPrimaryKeyAt(newPeakIndex);
+	const ValidItemID newPeakID = db->peaksTable->getPrimaryKeyAt(newPeakIndex);
 	regionFilterCombo->setCurrentIndex(0);
-	peakCombo->setCurrentIndex(selectablePeakIDs.indexOf(peakID) + 1);	// 0 is None
+	peakCombo->setCurrentIndex(selectablePeakIDs.indexOf(newPeakID) + 1);	// 0 is None
 }
 
 /**
@@ -386,8 +386,8 @@ void AscentDialog::handle_newTrip()
 	if (newTripIndex.isInvalid()) return;
 
 	populateItemCombo(db->tripsTable, db->tripsTable->nameColumn, true, tripCombo, selectableTripIDs);
-	ValidItemID tripID = db->tripsTable->getPrimaryKeyAt(newTripIndex);
-	tripCombo->setCurrentIndex(selectableTripIDs.indexOf(tripID) + 1);	// 0 is None
+	const ValidItemID newTripID = db->tripsTable->getPrimaryKeyAt(newTripIndex);
+	tripCombo->setCurrentIndex(selectableTripIDs.indexOf(newTripID) + 1);	// 0 is None
 }
 
 /**

src/dialogs/peak_dialog.cpp

@@ -206,8 +206,8 @@ void PeakDialog::handle_newRegion()
 	if (newRegionIndex.isInvalid()) return;
 
 	populateItemCombo(db->regionsTable, db->regionsTable->nameColumn, true, regionCombo, selectableRegionIDs);
-	ValidItemID regionID = db->regionsTable->getPrimaryKeyAt(newRegionIndex);
-	regionCombo->setCurrentIndex(selectableRegionIDs.indexOf(regionID) + 1);	// 0 is None
+	const ValidItemID newRegionID = db->regionsTable->getPrimaryKeyAt(newRegionIndex);
+	regionCombo->setCurrentIndex(selectableRegionIDs.indexOf(newRegionID) + 1);	// 0 is None
 }
 
 

src/dialogs/region_dialog.cpp

@@ -178,8 +178,8 @@ void RegionDialog::handle_newRange()
 	if (newRangeIndex.isInvalid()) return;
 
 	populateItemCombo(db->rangesTable, db->rangesTable->nameColumn, true, rangeCombo, selectableRangeIDs);
-	ValidItemID rangeID = db->rangesTable->getPrimaryKeyAt(newRangeIndex);
-	rangeCombo->setCurrentIndex(selectableRangeIDs.indexOf(rangeID) + 1);	// 0 is None
+	const ValidItemID newRangeID = db->rangesTable->getPrimaryKeyAt(newRangeIndex);
+	rangeCombo->setCurrentIndex(selectableRangeIDs.indexOf(newRangeID) + 1);	// 0 is None
 }
 
 /**
@@ -193,8 +193,8 @@ void RegionDialog::handle_newCountry()
 	if (newCountryIndex.isInvalid()) return;
 
 	populateItemCombo(db->countriesTable, db->countriesTable->nameColumn, true, countryCombo, selectableCountryIDs);
-	ValidItemID countryID = db->countriesTable->getPrimaryKeyAt(newCountryIndex);
-	countryCombo->setCurrentIndex(selectableCountryIDs.indexOf(countryID) + 1);	// 0 is None
+	const ValidItemID newCountryID = db->countriesTable->getPrimaryKeyAt(newCountryIndex);
+	countryCombo->setCurrentIndex(selectableCountryIDs.indexOf(newCountryID) + 1);	// 0 is None
 }
 
 

src/settings/project_settings_window.cpp

@@ -139,8 +139,8 @@ void ProjectSettingsWindow::handle_newHiker()
 	if (newHikerIndex.isInvalid()) return;
 
 	repopulateHikerCombo();
-	ValidItemID hikerID = db->hikersTable->getPrimaryKeyAt(newHikerIndex);
-	defaultHikerCombo->setCurrentIndex(selectableHikerIDs.indexOf(hikerID) + 1);	// 0 is None
+	const ValidItemID newHikerID = db->hikersTable->getPrimaryKeyAt(newHikerIndex);
+	defaultHikerCombo->setCurrentIndex(selectableHikerIDs.indexOf(newHikerID) + 1);	// 0 is None
 }