8 files changed, 10 insertions, 10 deletions
diff --git a/desktop-widgets/command.cpp b/desktop-widgets/command.cpp
index 1fc6fbe1c..e297f70d0 100644
--- a/desktop-widgets/command.cpp
+++ b/desktop-widgets/command.cpp
@@ -13,9 +13,9 @@ void addDive(dive *d, bool autogroup, bool newNumber)
 
 void importDives(struct dive_table *dives, struct trip_table *trips,
 		 bool prefer_imported, bool downloaded, bool merge_all_trips,
-		 const QString &source)
+		 bool add_to_new_trip, const QString &source)
 {
-	execute(new ImportDives(dives, trips, prefer_imported, downloaded, merge_all_trips, source));
+	execute(new ImportDives(dives, trips, prefer_imported, downloaded, merge_all_trips, add_to_new_trip, source));
 }
 
 void deleteDive(const QVector<struct dive*> &divesToDelete)
diff --git a/desktop-widgets/command.h b/desktop-widgets/command.h
index 83bde3b3a..cbc416e23 100644
--- a/desktop-widgets/command.h
+++ b/desktop-widgets/command.h
@@ -23,7 +23,7 @@ void addDive(dive *d, bool autogroup, bool newNumber); // If d->dive_trip is nul
 						       // insertion position.
 void importDives(struct dive_table *dives, struct trip_table *trips,
 		 bool prefer_imported, bool downloaded, bool merge_all_trips,
-		 const QString &source);
+		 bool add_to_new_trip, const QString &source);
 void deleteDive(const QVector<struct dive*> &divesToDelete);
 void shiftTime(const QVector<dive *> &changedDives, int amount);
 void renumberDives(const QVector<QPair<dive *, int>> &divesToRenumber);
diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp
index 4e985cf28..e7edaaa54 100644
--- a/desktop-widgets/command_divelist.cpp
+++ b/desktop-widgets/command_divelist.cpp
@@ -554,7 +554,7 @@ void AddDive::undoit()
 
 ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips,
 			 bool prefer_imported, bool downloaded, bool merge_all_trips,
-			 const QString &source)
+			 bool add_to_new_trip, const QString &source)
 {
 	setText(tr("import %n dive(s) from %1", "", dives->nr).arg(source));
 
@@ -562,7 +562,7 @@ ImportDives::ImportDives(struct dive_table *dives, struct trip_table *trips,
 	struct dive_table dives_to_remove = { 0 };
 	struct trip_table trips_to_add = { 0 };
 	process_imported_dives(dives, trips, prefer_imported, downloaded, merge_all_trips,
-			       &dives_to_add, &dives_to_remove, &trips_to_add);
+			       add_to_new_trip, &dives_to_add, &dives_to_remove, &trips_to_add);
 
 	// Add trips to the divesToAdd.trips structure
 	divesToAdd.trips.reserve(trips_to_add.nr);
diff --git a/desktop-widgets/command_divelist.h b/desktop-widgets/command_divelist.h
index 8eca0bb57..b823da7e7 100644
--- a/desktop-widgets/command_divelist.h
+++ b/desktop-widgets/command_divelist.h
@@ -100,7 +100,7 @@ public:
 	// Note: dives and trips are consumed - after the call they will be empty.
 	ImportDives(struct dive_table *dives, struct trip_table *trips,
 		    bool prefer_imported, bool downloaded, bool merge_all_trips,
-		    const QString &source);
+		    bool add_to_new_trip, const QString &source);
 private:
 	void undoit() override;
 	void redoit() override;
diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 638cf6094..869fb9d25 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -1012,7 +1012,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
 	}
 
 	QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files");
-	Command::importDives(&table, &trips, false, false, true, source);
+	Command::importDives(&table, &trips, false, false, true, false, source);
 }
 
 TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent)
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index 052b71c44..a3bc6287c 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -518,7 +518,7 @@ void DownloadFromDCWidget::on_ok_clicked()
 
 	if (table->nr > 0) {
 		auto data = thread.data();
-		Command::importDives(table, trips, preferDownloaded(), true, false, data->devName());
+		Command::importDives(table, trips, preferDownloaded(), true, false, ui.createNewTrip->isChecked(), data->devName());
 	}
 
 	if (ostcFirmwareCheck && currentState == DONE)
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 64cdc6cb3..18b1bd5fa 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -1716,7 +1716,7 @@ void MainWindow::importFiles(const QStringList fileNames)
 		parse_file(fileNamePtr.data(), &table, &trips);
 	}
 	QString source = fileNames.size() == 1 ? fileNames[0] : tr("multiple files");
-	Command::importDives(&table, &trips, false, false, true, source);
+	Command::importDives(&table, &trips, false, false, true, false, source);
 }
 
 void MainWindow::loadFiles(const QStringList fileNames)
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index e6ef6668e..9dac4dab3 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -772,7 +772,7 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton *button)
 		struct dive_table table = { 0 };
 		struct trip_table trips = { 0 };
 		parse_file(QFile::encodeName(zipFile.fileName()), &table, &trips);
-		Command::importDives(&table, &trips, false, false, true, QStringLiteral("divelogs.de"));
+		Command::importDives(&table, &trips, false, false, true, false, QStringLiteral("divelogs.de"));
 
 		/* store last entered user/pass in config */
 		QSettings s;