summaryrefslogtreecommitdiffstats
path: root/qt-ui/mainwindow.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-24 13:18:30 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-07-24 13:18:30 -0700
commita05e37188b5197f04b2cb68cf2df49994a758362 (patch)
tree8b483d32fda42bc4fc1c28d604510cef5b5586be /qt-ui/mainwindow.cpp
parent7e7dcb2451e02a3c9dc0c314feeef9a68c625b5a (diff)
downloadsubsurface-a05e37188b5197f04b2cb68cf2df49994a758362.tar.gz
QML UI: make sure the dive list is empty before loading dives
When testing subsurface-mobile on the desktop from an account that had a default file set up in the Subsurface preferences that file would already be loaded creating rather confusing output. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
-rw-r--r--qt-ui/mainwindow.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index d67187149..971b31c1c 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -433,16 +433,7 @@ void MainWindow::closeCurrentFile()
graphics()->setEmptyState();
/* free the dives and trips */
clear_git_id();
- while (dive_table.nr)
- delete_single_dive(0);
- while (dive_site_table.nr)
- delete_dive_site(get_dive_site(0)->uuid);
-
- free((void *)existing_filename);
- existing_filename = NULL;
-
- reset_min_datafile_version();
-
+ clear_dive_file_data();
cleanUpEmpty();
mark_divelist_changed(false);