From c01c35ca0ca2e42f2e2ea6a4d9c6e2b2f49c57d1 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 21 Jun 2015 21:30:38 -0700 Subject: Cylinder model: fix an obscure case that would access cylinder -1 If we remove a cylidner for a unique gas and that is allowable, then don't try to copy from cylinder with index same_gas (which is still -1). Signed-off-by: Dirk Hohndel --- qt-models/cylindermodel.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qt-models') diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp index 857381b71..a3ab34513 100644 --- a/qt-models/cylindermodel.cpp +++ b/qt-models/cylindermodel.cpp @@ -345,6 +345,9 @@ void CylindersModel::remove(const QModelIndex &index) } beginRemoveRows(QModelIndex(), index.row(), index.row()); // yah, know, ugly. rows--; + // if we didn't find an identical gas, point same_gas at the index.row() + if (same_gas == -1) + same_gas = index.row(); if (index.row() == 0) { // first gas - we need to make sure that the same gas ends up // as first gas -- cgit v1.2.3-70-g09d2