Skip to content

Commit aee40d6

Browse files
committed
Fix: Non-dirty column could be scheduled for update
This mainly affected the export dialog progress bar (which wouldn't fill up all the way)
1 parent cc42f51 commit aee40d6

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/comp_tables/composite_table.cpp

+9-3
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,18 @@ void CompositeTable::rebuildOrderBuffer(bool skipRepopulate)
410410
QSet<const CompositeColumn*> CompositeTable::getColumnsToUpdate() const
411411
{
412412
QSet<const CompositeColumn*> columnsToUpdate = QSet<const CompositeColumn*>(dirtyColumns);
413-
columnsToUpdate.subtract(hiddenColumns);
414-
if (currentSorting.column) columnsToUpdate.insert(currentSorting.column);
413+
414+
QSet<const CompositeColumn*> canStayDirty = QSet<const CompositeColumn*>(hiddenColumns);
415+
if (currentSorting.column) {
416+
canStayDirty.remove(currentSorting.column);
417+
}
415418
for (const Filter& filter : currentFilters) {
416419
assert(filter.column);
417-
columnsToUpdate.insert(filter.column);
420+
canStayDirty.remove(filter.column);
418421
}
422+
423+
columnsToUpdate.subtract(canStayDirty);
424+
419425
return columnsToUpdate;
420426
}
421427

0 commit comments

Comments
 (0)