diff options
| -rw-r--r-- | qt-ui/divelistview.cpp | 4 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index 9779d60e7..b0045b765 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -437,7 +437,11 @@ void DiveListView::merge_trip(const QModelIndex &a, int offset) trip_a->notes = strdup(trip_b->notes); while (trip_b->dives) add_dive_to_trip(trip_b->dives, trip_a); + rememberSelection(); reload(currentLayout, false); + fixMessyQtModelBehaviour(); + restoreSelection(); + mark_divelist_changed(TRUE); } void DiveListView::mergeTripAbove() diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 183143aff..8628ca558 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -145,6 +145,7 @@ void MainWindow::on_actionClose_triggered() while (dive_table.nr) delete_single_dive(0); + dive_list()->selectedTrips.clear(); /* clear the selection and the statistics */ selected_dive = -1; |