Hotfix: Failed assertion when editing photos in ascent viewer

svetter · Mar 13, 2024 · 1392397 · 1392397
1 parent 477e3fe
commit 1392397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/db/table.cpp b/src/db/table.cpp
@@ -489,6 +489,7 @@ void Table::updateRowInNormalTable(QWidget& parent, const ValidItemID primaryKey
 		const QVariant currentValue = buffer.getCell(bufferIndex, column->getIndex());
 		if (currentValue == newValue) columnDataPairs.remove(i);
 	}
+	if (columnDataPairs.isEmpty()) return;
 
 	updateRowsInNormalTable(parent, { bufferIndex }, columnDataPairs);
 }

diff --git a/src/viewer/ascent_viewer.cpp b/src/viewer/ascent_viewer.cpp
@@ -832,7 +832,9 @@ void AscentViewer::savePhotosList()
 	for (int i = 0; i < photos.size(); i++) {
 		photos[0].sortIndex = i;
 	}
+	db.beginChangingData();
 	db.photosTable.updateRows(*this, FORCE_VALID(currentAscentID), photos);
+	db.finishChangingData();
 }
 
 
@@ -849,7 +851,9 @@ void AscentViewer::saveDescription()
 	QString newDescription = descriptionTextBrowser->toPlainText();
 	bool descriptionChanged = db.ascentsTable.descriptionColumn.getValueFor(FORCE_VALID(currentAscentID)) != newDescription;
 	if (descriptionChanged) {
+		db.beginChangingData();
 		db.ascentsTable.updateCell(*this, FORCE_VALID(currentAscentID), db.ascentsTable.descriptionColumn, newDescription);
+		db.finishChangingData();
 	}
 }