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: fix potential 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 20:27:45 -03:00 • committed by Dirk Hohndel
parent 0592771005
commit 7763b95e5f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qt-ui/maintab.cpp
View file

@ -498,7 +498,8 @@ void MainTab::updateDiveInfo(bool clear)
if (ds) { if (ds) {
ui.location->setText(ds->name); ui.location->setText(ds->name);
ui.locationTags->setText(ds->description); // TODO: This should be three tags following davide's explanation. 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); if (displayed_dive.dive_site_uuid)
copy_dive_site(get_dive_site_by_uuid(displayed_dive.dive_site_uuid), &displayed_dive_site);
} else { } else {
ui.location->clear(); ui.location->clear();
clear_dive_site(&displayed_dive_site); clear_dive_site(&displayed_dive_site);
@ -800,7 +801,8 @@ void MainTab::acceptChanges()
struct dive *added_dive = clone_dive(&displayed_dive); struct dive *added_dive = clone_dive(&displayed_dive);
record_dive(added_dive); record_dive(added_dive);
addedId = added_dive->id; addedId = added_dive->id;
copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid)); if (displayed_dive_site.uuid)
copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid));
// unselect everything as far as the UI is concerned and select the new // unselect everything as far as the UI is concerned and select the new
// dive - we'll have to undo/redo this later after we resort the dive_table // dive - we'll have to undo/redo this later after we resort the dive_table
@ -860,7 +862,8 @@ void MainTab::acceptChanges()
saveTaggedStrings(); saveTaggedStrings();
saveTags(); saveTags();
copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid)); if (displayed_dive_site.uuid)
copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid));
if (editMode != ADD && cylindersModel->changed) { if (editMode != ADD && cylindersModel->changed) {
mark_divelist_changed(true); mark_divelist_changed(true);