mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site rewrite: try to fix a crash

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-06-26 15:03:34 -03:00 • committed by Dirk Hohndel
parent 2fec1a88de
commit 05c5bf0919
5 changed files with 41 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/maintab.cpp
View file

@ -492,10 +492,15 @@ void MainTab::updateDiveInfo(bool clear)
if (!clear) {
struct dive_site *ds = get_dive_site_by_uuid(displayed_dive.dive_site_uuid);
if (ds)
if (ds) {
ui.location->setText(ds->name);
else
ui.locationTags->setText(ds->description); // TODO: This should be three tags following davide's explanation.
copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site);
} else {
ui.location->clear();
clear_dive_site(&displayed_dive_site);
}
// Subsurface always uses "local time" as in "whatever was the local time at the location"
// so all time stamps have no time zone information and are in UTC
QDateTime localTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when));
@ -698,13 +703,10 @@ void MainTab::updateDiveInfo(bool clear)
gasUsedString.append(QString("O2: %2\n").arg(get_volume_string(o2_tot, true)));
}
ui.gasConsumption->setText(gasUsedString);
ui.locationTags->setText(ds->description); // TODO: This should be three tags following davide's explanation.
if(ui.locationTags->text().isEmpty())
ui.locationTags->hide();
else
ui.locationTags->show();
copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site);
} else {
/* clear the fields */
clearInfo();