summaryrefslogtreecommitdiffstats
path: root/qt-ui/locationinformation.cpp
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-08-31 21:45:31 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-31 18:43:43 -0700
commit1ef20ee5d8b13a5413ec5aabf16aaa1f1bdd65fd (patch)
treea3606c0fec918f5e1c51bf4c2f0b7ba2c3f0dfe0 /qt-ui/locationinformation.cpp
parente36e4d1faa95439a1806935de6dcbd04d2283d20 (diff)
downloadsubsurface-1ef20ee5d8b13a5413ec5aabf16aaa1f1bdd65fd.tar.gz
Merge the dive sites selected.
Wee. :) Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/locationinformation.cpp')
-rw-r--r--qt-ui/locationinformation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp
index d029dd2a1..9e2821ceb 100644
--- a/qt-ui/locationinformation.cpp
+++ b/qt-ui/locationinformation.cpp
@@ -70,7 +70,7 @@ void LocationInformationWidget::mergeSelectedDiveSites() {
Q_FOREACH(const QModelIndex& idx, selection) {
selected_dive_sites[i] = (uint32_t) idx.data(LocationInformationModel::UUID_ROLE).toInt();
}
- merge_dive_sites(selected_dive_sites, i);
+ merge_dive_sites(displayed_dive_site.uuid, selected_dive_sites, i);
free(selected_dive_sites);
}