diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-19 14:16:33 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-19 14:20:18 -0800 |
| commit | 6acff53735c41cc6636525aa364c62808219d3fb (patch) | |
| tree | 6639d39a470725444475420ed7587061801fa2b4 /qt-ui/models.cpp | |
| parent | 65e980d483576e952d15b14c369ac9beb7a07605 (diff) | |
| download | subsurface-6acff53735c41cc6636525aa364c62808219d3fb.tar.gz | |
Fix trip summary line in dive list
Two errors fixed.
- With no location set, the summary line would start with a ','.
- When auto creating a trip for a manually added dive or when editing the
dates of dives in a trip, the timestamp for the trip was not updated
after editing the dive.
Fixes #293
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/models.cpp')
| -rw-r--r-- | qt-ui/models.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 2a0f9e98e..d0c244917 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -929,7 +929,10 @@ QVariant TripItem::data(int column, int role) const if (role == Qt::DisplayRole) { switch (column) { case DiveTripModel::NR: - ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives); + if (trip->location && *trip->location) + ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives); + else + ret = get_trip_date_string(trip->when, trip->nrdives); break; } } |