mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive trips: don't crash on repeated trip-removal

Browse source 
In the UI it is possible to remove a dive from a trip twice,
which leads to a crash, because trip is NULL (obviously).

Instead of doing a proper fix (don't show the "remove from
trip" entry in the first place), ignore dives without a
trip, since a rewrite of the undo-code is planned for the
medium future anyway.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-08-29 20:30:01 +02:00 • committed by Dirk Hohndel
parent 2d87a657d2
commit 156e053050
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/divelistview.cpp
View file

@ -684,9 +684,12 @@ void DiveListView::removeFromTrip()
struct dive *d; struct dive *d;
QMap<struct dive*, dive_trip*> divesToRemove; QMap<struct dive*, dive_trip*> divesToRemove;
for_each_dive (i, d) { for_each_dive (i, d) {
if (d->selected) if (d->selected && d->divetrip)
divesToRemove.insert(d, d->divetrip); divesToRemove.insert(d, d->divetrip);
} }
if (divesToRemove.isEmpty())
return;
UndoRemoveDivesFromTrip *undoCommand = new UndoRemoveDivesFromTrip(divesToRemove); UndoRemoveDivesFromTrip *undoCommand = new UndoRemoveDivesFromTrip(divesToRemove);
MainWindow::instance()->undoStack->push(undoCommand); MainWindow::instance()->undoStack->push(undoCommand);