From 7a07665d89aa26d37a8aa8defd20cbe1a569c874 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 27 Jan 2014 16:21:13 -0200 Subject: Do not create label if string is empty. Do not create a text label if the returned string is empty. Also, fixed a potential crash after not creating a label and adding it to the list of created labels. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/profile/divecartesianaxis.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp index b1586f992..7a58e3bb4 100644 --- a/qt-ui/profile/divecartesianaxis.cpp +++ b/qt-ui/profile/divecartesianaxis.cpp @@ -121,12 +121,15 @@ void DiveCartesianAxis::updateTicks() DiveTextItem *label = NULL; if (showText){ + QString text = textForValue(currValue); + if(text.isEmpty()) + continue; // Do not create or do anything with an empty string. label = new DiveTextItem(this); label->setText(textForValue(currValue)); label->setBrush(QBrush(textColor)); label->setBrush(colorForValue(currValue)); + labels.push_back(label); } - labels.push_back(label); if (orientation == RightToLeft || orientation == LeftToRight) { if(showText){ label->setAlignment(Qt::AlignBottom | Qt::AlignHCenter); -- cgit v1.2.3-70-g09d2