2 files changed, 2 insertions, 6 deletions
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp
index b1501b380..181f89b1d 100644
--- a/subsurface-core/subsurface-qt/DiveObjectHelper.cpp
+++ b/subsurface-core/subsurface-qt/DiveObjectHelper.cpp
@@ -34,8 +34,6 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
 }
 
 DiveObjectHelper::DiveObjectHelper(struct dive *d) :
-	m_suit(d->suit ? d->suit : EMPTY_DIVE_STRING),
-	m_trip(d->divetrip ? d->divetrip->location : EMPTY_DIVE_STRING),
 	m_maxcns(d->maxcns),
 	m_otu(d->otu),
 	m_dive(d)
@@ -215,7 +213,7 @@ QString DiveObjectHelper::weight(int idx) const
 
 QString DiveObjectHelper::suit() const
 {
-	return m_suit;
+	return m_dive->suit ? m_dive->suit : EMPTY_DIVE_STRING;
 }
 
 QStringList DiveObjectHelper::cylinders() const
@@ -232,7 +230,7 @@ QString DiveObjectHelper::cylinder(int idx) const
 
 QString DiveObjectHelper::trip() const
 {
-	return m_trip;
+	return m_dive->divetrip ? m_dive->divetrip->location : EMPTY_DIVE_STRING;
 }
 
 QString DiveObjectHelper::maxcns() const
diff --git a/subsurface-core/subsurface-qt/DiveObjectHelper.h b/subsurface-core/subsurface-qt/DiveObjectHelper.h
index a47bff599..b96eb6187 100644
--- a/subsurface-core/subsurface-qt/DiveObjectHelper.h
+++ b/subsurface-core/subsurface-qt/DiveObjectHelper.h
@@ -70,9 +70,7 @@ private:
 	QString m_gas;
 	QString m_sac;
 	QStringList m_weights;
-	QString m_suit;
 	QStringList m_cylinders;
-	QString m_trip;
 	QString m_maxcns;
 	QString m_otu;
 	struct dive *m_dive;