Fix: Failed assertions when creating new database

For #213
svetter · Mar 12, 2024 · 5687b37 · 5687b37
1 parent 04854dd
commit 5687b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/comp_tables/composite_table.cpp b/src/comp_tables/composite_table.cpp
@@ -747,7 +747,8 @@ void CompositeTable::setUpdateImmediately(bool updateImmediately, QProgressDialo
  */
 void CompositeTable::announceChanges(const QSet<const Column*>& affectedColumns, const QList<QPair<BufferRowIndex, bool>>& rowsAddedOrRemoved)
 {
-	assert(bufferInitialized);
+	if (!bufferInitialized) return;
+
 	const bool rowChanges = !rowsAddedOrRemoved.isEmpty();
 	assert(!rowChanges || !affectedColumns.isEmpty());
 

diff --git a/src/settings/project_settings_window.cpp b/src/settings/project_settings_window.cpp
@@ -123,13 +123,11 @@ void ProjectSettingsWindow::saveSettings()
 
 		db.beginChangingData();
 		db.hikersTable.addRow(*this, *newDefaultHiker);
-		db.projectSettings.defaultHiker.set(*this, newDefaultHiker->hikerID.asQVariant());
 		db.finishChangingData();
+		db.projectSettings.defaultHiker.set(*this, newDefaultHiker->hikerID.asQVariant());
 	}
 	else {
-		db.beginChangingData();
 		db.projectSettings.defaultHiker.set(*this, parseItemCombo(*defaultHikerCombo, selectableHikerIDs).asQVariant());
-		db.finishChangingData();
 	}
 }