Notes pane: don't show empty taxonomy tags

No point in searching for the right tag if the user picked no taxonomy to
be shown. And no point in showing an empty value, either.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index a4b1722bd..c0f5434d7 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -515,10 +515,15 @@ void MainTab::updateDiveInfo(bool clear)
 				locationTag = "<small><small>(tags: ";
 				QString connector = "";
 				for (int i = 0; i < 3; i++) {
+					if (prefs.geocoding.category[i] == TC_NONE)
+						continue;
 					for (int j = 0; j < TC_NR_CATEGORIES; j++) {
 						if (ds->taxonomy.category[j].category == prefs.geocoding.category[i]) {
-							locationTag += connector + QString(ds->taxonomy.category[j].value);
-							connector = " / ";
+							QString tag = ds->taxonomy.category[j].value;
+							if (!tag.isEmpty()) {
+								locationTag += connector + tag;
+								connector = " / ";
+							}
 							break;
 						}
 					}