diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2015-11-17 00:29:22 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-16 15:07:07 -0800 |
| commit | e6c86700e49ffac409d2cd117619e34631bc922c (patch) | |
| tree | 982147eab2f07faf743b41af0a1264c1c08d13fb /subsurface-core | |
| parent | 7e749e8ea4a4c73e01bca1b23dd96aaccbc4fa07 (diff) | |
| download | subsurface-e6c86700e49ffac409d2cd117619e34631bc922c.tar.gz | |
qthelper.cpp: improve getFormattedCylinder()
When the user requests "dive.cylinders" from Grantlee HTML
we need to always put at least the default cylinder and mark
the description as "unknown" (same as other locations) if it's
not set (i.e. when the description pointer is NULL).
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core')
| -rw-r--r-- | subsurface-core/qthelper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp index c3ea37c97..cc41db2da 100644 --- a/subsurface-core/qthelper.cpp +++ b/subsurface-core/qthelper.cpp @@ -337,9 +337,10 @@ void Dive::put_suit() static QString getFormattedCylinder(struct dive *dive, unsigned int idx) { cylinder_t *cyl = &dive->cylinder[idx]; - if (!cyl->type.description) + const char *desc = cyl->type.description; + if (!desc && idx > 0) return QString(EMPTY_DIVE_STRING); - QString fmt = QString(cyl->type.description); + QString fmt = desc ? QString(desc) : QObject::tr("unknown"); fmt += ", " + get_volume_string(cyl->type.size, true, 0); fmt += ", " + get_pressure_string(cyl->type.workingpressure, true); fmt += ", " + get_pressure_string(cyl->start, false) + " - " + get_pressure_string(cyl->end, true); |