From ddfc384b61b5990a54a5b0613a39c3ffb4ac23f4 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 26 Nov 2019 23:41:56 +0100 Subject: Cylinders: Fix crash when removing cylinders Change the remove() function of the cylinder and weight models to take the index by value. The code used to take it by reference and the reference would be invalidated when removing rows from the model! Reported-by: Gaetan Bisson Signed-off-by: Berthold Stoeger --- qt-models/cylindermodel.cpp | 2 +- qt-models/cylindermodel.h | 2 +- qt-models/weightmodel.cpp | 2 +- qt-models/weightmodel.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qt-models') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 22fc5ae8b..5d697470f 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -486,7 +486,7 @@ Qt::ItemFlags CylindersModel::flags(const QModelIndex &index) const return QAbstractItemModel::flags(index) | Qt::ItemIsEditable; } -void CylindersModel::remove(const QModelIndex &index) +void CylindersModel::remove(QModelIndex index) { if (index.column() == USE) { diff --git a/qt-models/cylindermodel.h b/qt-models/cylindermodel.h index 0def53ba9..1596fa87f 100644 --- a/qt-models/cylindermodel.h +++ b/qt-models/cylindermodel.h @@ -46,7 +46,7 @@ public: public slots: - void remove(const QModelIndex &index); + void remove(QModelIndex index); void cylindersReset(const QVector &dives); bool updateBestMixes(); diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp index 3b5a122bf..36971f12e 100644 --- a/qt-models/weightmodel.cpp +++ b/qt-models/weightmodel.cpp @@ -21,7 +21,7 @@ weightsystem_t *WeightModel::weightSystemAt(const QModelIndex &index) return &displayed_dive.weightsystems.weightsystems[index.row()]; } -void WeightModel::remove(const QModelIndex &index) +void WeightModel::remove(QModelIndex index) { if (index.column() != REMOVE) return; diff --git a/qt-models/weightmodel.h b/qt-models/weightmodel.h index 2f59daf4b..21737a42c 100644 --- a/qt-models/weightmodel.h +++ b/qt-models/weightmodel.h @@ -31,7 +31,7 @@ public: public slots: - void remove(const QModelIndex &index); + void remove(QModelIndex index); void weightsystemsReset(const QVector &dives); private: -- cgit v1.2.3-70-g09d2