From 96cffe88e72cefa29c13dd839332b0cc7ce42ed2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 31 May 2015 16:12:56 -0700 Subject: [PATCH] Fix crash With no dive sites we dereference a NULL pointer. Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 720193a6b..2ecfb6c6d 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -219,8 +219,13 @@ MainTab::~MainTab() void MainTab::setCurrentLocationIndex() { - if (current_dive) - ui.location->setCurrentText(get_dive_site_by_uuid(current_dive->dive_site_uuid)->name); + if (current_dive) { + struct dive_site *ds = get_dive_site_by_uuid(current_dive->dive_site_uuid); + if (ds) + ui.location->setCurrentText(ds->name); + else + ui.location->setCurrentText(""); + } } void MainTab::enableGeoLookupEdition()