Merge branch 'divesites'

This brings in the dive site infrastructure and initial UI work

1 files changed, 2 insertions, 2 deletions

diff --git a/qt-ui/filtermodels.cpp b/qt-ui/filtermodels.cpp
index 378f46735..f44ab7cf8 100644
--- a/qt-ui/filtermodels.cpp
+++ b/qt-ui/filtermodels.cpp
@@ -249,7 +249,7 @@ bool LocationFilterModel::doFilter(struct dive *d, QModelIndex &index0, QAbstrac
 		return true;
 	}
 	// Checked means 'Show', Unchecked means 'Hide'.
-	QString location(d->location);
+	QString location(get_dive_location(d));
 	// only show empty location dives if the user checked that.
 	if (location.isEmpty()) {
 		if (rowCount() > 0)
@@ -277,7 +277,7 @@ void LocationFilterModel::repopulate()
 	struct dive *dive;
 	int i = 0;
 	for_each_dive (i, dive) {
-		QString location(dive->location);
+		QString location(get_dive_location(dive));
 		if (!location.isEmpty() && !list.contains(location)) {
 			list.append(location);
 		}