diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-09-24 03:42:40 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-09-24 03:42:40 -0700 |
| commit | 446ab45858b509e56029e5c1557a12ca3680a674 (patch) | |
| tree | 129888e7d75600c63bd43cbb099e5901549c9b9b /qt-ui/divelistview.cpp | |
| parent | 2d40172d78436b8aef3eab238faabe2ce3f9830f (diff) | |
| download | subsurface-446ab45858b509e56029e5c1557a12ca3680a674.tar.gz | |
Only offer to merge dives if they are consecutive in the divelist
You cannot merge dives if there is another, unselected dive "between"
them.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/divelistview.cpp')
| -rw-r--r-- | qt-ui/divelistview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index ddd10e219..383307613 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -400,7 +400,7 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event) } if (d) popup.addAction(tr("delete dive"), this, SLOT(deleteDive())); - if (amount_selected > 1) + if (amount_selected > 1 && consecutive_selected()) popup.addAction(tr("merge selected dives"), this, SLOT(mergeDives())); // "collapse all" really closes all trips, // "collapse" keeps the trip with the selected dive open |