From ac9bab7e2fdc08a3ce691a2c7035e315ec3d8ff2 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Sun, 14 Oct 2018 08:20:59 +0200 Subject: Autogroup only when selected Comits f427226b3b and 43c3885249f of the undo series introduced 2 calls of autogroup_dives() without checking the autogroup global boolean. This is a bug. An import from DC (for example) then triggers an autogrouping, the divelist is autogrouped, and the UI button is off. This commit solves this. I've chosen for a guard in the autogroup_dives() that now is a no-op when called when the user did not select autogrouping. In additon, simplified the other calls to this function, as we do not need to check before calling any more. Signed-off-by: Jan Mulder --- qt-models/diveimportedmodel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index 6926981d5..e988a8678 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -174,8 +174,7 @@ void DiveImportedModel::recordDives() } process_imported_dives(diveTable, true, true); - if (autogroup) - autogroup_dives(); + autogroup_dives(); } QHash DiveImportedModel::roleNames() const { -- cgit v1.2.3-70-g09d2