Fix: Assertion fail when changing any item except ascents

Author: svetter

src/dialogs/ascent_dialog.cpp

@@ -674,7 +674,8 @@ static BufferRowIndex openAscentDialogAndStore(QWidget* parent, Database* db, Di
 
 	AscentDialog dialog(parent, db, purpose, originalAscent);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Ascent* extractedAscent = dialog.extractData();
+		const ValidItemID originalAscentID = FORCE_VALID(originalAscent->ascentID);
+		Ascent* const extractedAscent = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
@@ -695,7 +696,7 @@ static BufferRowIndex openAscentDialogAndStore(QWidget* parent, Database* db, Di
 			}
 
 			// Set result to existing buffer row to signal that changes were made
-			newAscentIndex = db->ascentsTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedAscent->ascentID));
+			newAscentIndex = db->ascentsTable->getBufferIndexForPrimaryKey(originalAscentID);
 			break;
 		default:
 			assert(false);

src/dialogs/country_dialog.cpp

@@ -237,18 +237,19 @@ static BufferRowIndex openCountryDialogAndStore(QWidget* parent, Database* db, D
 
 	CountryDialog dialog(parent, db, purpose, originalCountry);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Country* extractedCountry = dialog.extractData();
+		const ValidItemID originalCountryID = FORCE_VALID(originalCountry->countryID);
+		Country* const extractedCountry = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newCountryIndex = db->countriesTable->addRow(parent, extractedCountry);
 			break;
 		case editItem:
-			db->countriesTable->updateRow(parent, FORCE_VALID(originalCountry->countryID), extractedCountry);
+			db->countriesTable->updateRow(parent, originalCountryID, extractedCountry);
 
 			// Set result to existing buffer row to signal that changes were made
-			newCountryIndex = db->countriesTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedCountry->countryID));
+			newCountryIndex = db->countriesTable->getBufferIndexForPrimaryKey(originalCountryID);
 			break;
 		default:
 			assert(false);

src/dialogs/hiker_dialog.cpp

@@ -244,18 +244,19 @@ static BufferRowIndex openHikerDialogAndStore(QWidget* parent, Database* db, Dia
 
 	HikerDialog dialog(parent, db, purpose, originalHiker);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Hiker* extractedHiker = dialog.extractData();
+		const ValidItemID originalHikerID = FORCE_VALID(originalHiker->hikerID);
+		Hiker* const extractedHiker = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newHikerIndex = db->hikersTable->addRow(parent, extractedHiker);
 			break;
 		case editItem:
-			db->hikersTable->updateRow(parent, FORCE_VALID(originalHiker->hikerID), extractedHiker);
+			db->hikersTable->updateRow(parent, originalHikerID, extractedHiker);
 
 			// Set result to existing buffer row to signal that changes were made
-			newHikerIndex = db->hikersTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedHiker->hikerID));
+			newHikerIndex = db->hikersTable->getBufferIndexForPrimaryKey(originalHikerID);
 			break;
 		default:
 			assert(false);

src/dialogs/peak_dialog.cpp

@@ -332,18 +332,19 @@ static BufferRowIndex openPeakDialogAndStore(QWidget* parent, Database* db, Dial
 
 	PeakDialog dialog(parent, db, purpose, originalPeak);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Peak* extractedPeak = dialog.extractData();
+		const ValidItemID originalPeakID = FORCE_VALID(originalPeak->peakID);
+		Peak* const extractedPeak = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newPeakIndex = db->peaksTable->addRow(parent, extractedPeak);
 			break;
 		case editItem:
-			db->peaksTable->updateRow(parent, FORCE_VALID(originalPeak->peakID), extractedPeak);
+			db->peaksTable->updateRow(parent, originalPeakID, extractedPeak);
 
 			// Set result to existing buffer row to signal that changes were made
-			newPeakIndex = db->peaksTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedPeak->peakID));
+			newPeakIndex = db->peaksTable->getBufferIndexForPrimaryKey(originalPeakID);
 			break;
 		default:
 			assert(false);

src/dialogs/range_dialog.cpp

@@ -254,18 +254,19 @@ static BufferRowIndex openRangeDialogAndStore(QWidget* parent, Database* db, Dia
 
 	RangeDialog dialog(parent, db, purpose, originalRange);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Range* extractedRange = dialog.extractData();
+		const ValidItemID originalRangeID = FORCE_VALID(originalRange->rangeID);
+		Range* const extractedRange = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newRangeIndex = db->rangesTable->addRow(parent, extractedRange);
 			break;
 		case editItem:
-			db->rangesTable->updateRow(parent, FORCE_VALID(originalRange->rangeID), extractedRange);
+			db->rangesTable->updateRow(parent, originalRangeID, extractedRange);
 
 			// Set result to existing buffer row to signal that changes were made
-			newRangeIndex = db->rangesTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedRange->rangeID));
+			newRangeIndex = db->rangesTable->getBufferIndexForPrimaryKey(originalRangeID);
 			break;
 		default:
 			assert(false);

src/dialogs/region_dialog.cpp

@@ -305,18 +305,19 @@ static BufferRowIndex openRegionDialogAndStore(QWidget* parent, Database* db, Di
 
 	RegionDialog dialog(parent, db, purpose, originalRegion);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Region* extractedRegion = dialog.extractData();
+		const ValidItemID originalRegionID = FORCE_VALID(originalRegion->regionID);
+		Region* const extractedRegion = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newRegionIndex = db->regionsTable->addRow(parent, extractedRegion);
 			break;
 		case editItem:
-			db->regionsTable->updateRow(parent, FORCE_VALID(originalRegion->regionID), extractedRegion);
+			db->regionsTable->updateRow(parent, originalRegionID, extractedRegion);
 
 			// Set result to existing buffer row to signal that changes were made
-			newRegionIndex = db->regionsTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedRegion->regionID));
+			newRegionIndex = db->regionsTable->getBufferIndexForPrimaryKey(originalRegionID);
 			break;
 		default:
 			assert(false);

src/dialogs/trip_dialog.cpp

@@ -304,18 +304,19 @@ static BufferRowIndex openTripDialogAndStore(QWidget* parent, Database* db, Dial
 
 	TripDialog dialog(parent, db, purpose, originalTrip);
 	if (dialog.exec() == QDialog::Accepted && (purpose != editItem || dialog.changesMade())) {
-		Trip* extractedTrip = dialog.extractData();
+		const ValidItemID originalTripID = FORCE_VALID(originalTrip->tripID);
+		Trip* const extractedTrip = dialog.extractData();
 
 		switch (purpose) {
 		case newItem:
 		case duplicateItem:
 			newTripIndex = db->tripsTable->addRow(parent, extractedTrip);
 			break;
 		case editItem:
-			db->tripsTable->updateRow(parent, FORCE_VALID(originalTrip->tripID), extractedTrip);
+			db->tripsTable->updateRow(parent, originalTripID, extractedTrip);
 
 			// Set result to existing buffer row to signal that changes were made
-			newTripIndex = db->tripsTable->getBufferIndexForPrimaryKey(FORCE_VALID(extractedTrip->tripID));
+			newTripIndex = db->tripsTable->getBufferIndexForPrimaryKey(originalTripID);
 			break;
 		default:
 			assert(false);