From e6c86700e49ffac409d2cd117619e34631bc922c Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 17 Nov 2015 00:29:22 +0200 Subject: [PATCH] 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 Signed-off-by: Dirk Hohndel --- subsurface-core/qthelper.cpp | 5 +++-- 1 file 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);