1 files changed, 18 insertions, 8 deletions

diff --git a/desktop-widgets/undocommands.cpp b/desktop-widgets/undocommands.cpp
index 0c1a4b541..06879eb51 100644
--- a/desktop-widgets/undocommands.cpp
+++ b/desktop-widgets/undocommands.cpp
@@ -48,13 +48,7 @@ void UndoDeleteDive::redo()
 		// check for trip - if this is the last dive in the trip
 		// the trip will get deleted, so we need to remember it as well
 		if (d->divetrip && d->divetrip->nrdives == 1) {
-			struct dive_trip *undo_trip = (struct dive_trip *)calloc(1, sizeof(struct dive_trip));
-			*undo_trip = *d->divetrip;
-			undo_trip->location = copy_string(d->divetrip->location);
-			undo_trip->notes = copy_string(d->divetrip->notes);
-			undo_trip->nrdives = 0;
-			undo_trip->next = NULL;
-			undo_trip->dives = NULL;
+			dive_trip *undo_trip = clone_empty_trip(d->divetrip);
 			// update all the dives who were in this trip to point to the copy of the
 			// trip that we are about to delete implicitly when deleting its last dive below
 			Q_FOREACH(struct dive *inner_dive, newList) {
@@ -141,10 +135,15 @@ UndoRemoveDivesFromTrip::UndoRemoveDivesFromTrip(QMap<dive *, dive_trip *> remov
 
 void UndoRemoveDivesFromTrip::undo()
 {
+	// first bring back the trip(s)
+	Q_FOREACH(struct dive_trip *trip, tripList)
+		insert_trip(&trip);
+	tripList.clear();
+
 	QMapIterator<dive*, dive_trip*> i(divesToUndo);
 	while (i.hasNext()) {
 		i.next();
-		add_dive_to_trip(i.key (), i.value());
+		add_dive_to_trip(i.key(), i.value());
 	}
 	mark_divelist_changed(true);
 	MainWindow::instance()->refreshDisplay();
@@ -155,6 +154,17 @@ void UndoRemoveDivesFromTrip::redo()
 	QMapIterator<dive*, dive_trip*> i(divesToUndo);
 	while (i.hasNext()) {
 		i.next();
+		// If the trip will be deleted, remember it so that we can restore it later.
+		dive_trip *trip = i.value();
+		if (trip->nrdives == 1) {
+			dive_trip *cloned_trip = clone_empty_trip(trip);
+			tripList.append(cloned_trip);
+			// Rewrite the dive list, such that the dives will be added to the resurrected trip.
+			for (dive_trip *&old_trip: divesToUndo) {
+				if (old_trip == trip)
+					old_trip = cloned_trip;
+			}
+		}
 		remove_dive_from_trip(i.key(), false);
 	}
 	mark_divelist_changed(true);