Skip to content

Commit 1bafdb3

Browse files
committed
Fix: Crash on startup when no default hiker is set
1 parent 5c5ffa3 commit 1bafdb3

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/comp_tables/fold_composite_column.cpp

+10-7
Original file line numberDiff line numberDiff line change
@@ -343,13 +343,16 @@ QStringList HikerListCompositeColumn::formatAndSortIntoStringList(QSet<BufferRow
343343
const HikersTable* hikersTable = (HikersTable*) contentColumn->table;
344344

345345
// Check whether default hiker is set and get name if so
346-
BufferRowIndex defaultHikerRowIndex = hikersTable->getBufferIndexForPrimaryKey(defaultHiker->get());
347-
if (defaultHiker->isNotNull() && rowIndexSet.contains(defaultHikerRowIndex)) {
348-
QVariant content = contentColumn->getValueAt(defaultHikerRowIndex);
349-
assert(content.canConvert<QString>());
350-
defaultHikerString = content.toString();
351-
// Remove default hiker from row index set
352-
rowIndexSet.remove(defaultHikerRowIndex);
346+
if (defaultHiker->isNotNull()) {
347+
ValidItemID defaultHikerID = defaultHiker->get();
348+
BufferRowIndex defaultHikerRowIndex = hikersTable->getBufferIndexForPrimaryKey(defaultHikerID);
349+
if (rowIndexSet.contains(defaultHikerRowIndex)) {
350+
QVariant content = contentColumn->getValueAt(defaultHikerRowIndex);
351+
assert(content.canConvert<QString>());
352+
defaultHikerString = content.toString();
353+
// Remove default hiker from row index set
354+
rowIndexSet.remove(defaultHikerRowIndex);
355+
}
353356
}
354357

355358
for (const BufferRowIndex& rowIndex : rowIndexSet) {

0 commit comments

Comments
 (0)