From 4e583f91206a7f62c73bed58a338ebc28620774c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 22 Oct 2019 16:20:55 -0400 Subject: [PATCH] Mobile: avoid dereferencing undefined values Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveList.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 18b51d70e..07fd7ba4e 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -155,7 +155,7 @@ Kirigami.ScrollablePage { anchors.left: leftBarDive.right Controls.Label { id: locationText - text: location + text: (undefined !== location) ? location : "" font.weight: Font.Bold font.pointSize: subsurfaceTheme.regularPointSize elide: Text.ElideRight @@ -179,14 +179,14 @@ Kirigami.ScrollablePage { Controls.Label { id: dateLabel - text: dateTime + text: (undefined !== dateTime) ? dateTime : "" width: Math.max(locationText.width * 0.45, paintedWidth) // helps vertical alignment throughout listview font.pointSize: subsurfaceTheme.smallPointSize color: innerListItem.checked ? subsurfaceTheme.darkerPrimaryTextColor : secondaryTextColor } // let's try to show the depth / duration very compact Controls.Label { - text: depthDuration + text: (undefined !== depthDuration) ? depthDuration : "" width: Math.max(Kirigami.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview font.pointSize: subsurfaceTheme.smallPointSize color: innerListItem.checked ? subsurfaceTheme.darkerPrimaryTextColor : secondaryTextColor