summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-11-15 20:16:02 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-11-16 08:29:53 -0800
commit12c7c5ea961bcdc866dbf6ce121c428d43c3730b (patch)
treeda2c5a001b75464af814151b3c6534e4633921d8 /desktop-widgets
parent808316f4342dff72fd79cfadf3cc01e41237c65e (diff)
downloadsubsurface-12c7c5ea961bcdc866dbf6ce121c428d43c3730b.tar.gz
Cleanup: move clearing of current_dive into clear_dive_file_data()
It makes no sense to have a non-NULL current_dive once all dives have been deleted. Therefore, clear current_dive implicitly in clear_dive_file_data() and don't depend on the caller performing this. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/mainwindow.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp
index 416119b3b..632917733 100644
--- a/desktop-widgets/mainwindow.cpp
+++ b/desktop-widgets/mainwindow.cpp
@@ -658,7 +658,6 @@ void MainWindow::closeCurrentFile()
/* free the dives and trips */
clear_git_id();
clear_dive_file_data();
- current_dive = nullptr;
setCurrentFile(nullptr);
graphics->setEmptyState();
mainTab->clearTabs();