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

cleanup: move clearing of device nodes to clear_dive_file_data()

Browse source 
It makes no sense to keep the device nodes if all the other data
is cleared. Let's do this automatically and not explicitly.
This ensures that the function is also called on mobile.
Currently it was only called on desktop.

Weirdly, the parser-tests were expecting that the device nodes
were not reset by clear_dive_file_data() and therefore divecomputers
were accumulating in the test results. Thus, the additional
computers had to be removed from the expected test results.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-04-23 23:32:42 +02:00 • committed by Dirk Hohndel
parent 52f93ea326
commit 17526ded58
11 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
desktop-widgets/mainwindow.cpp
View file

@ -18,7 +18,6 @@
#include "core/color.h"
#include "core/device.h"
#include "core/divecomputer.h"
#include "core/divesitehelpers.h"
#include "core/errorhelper.h"
#include "core/file.h"
@ -653,7 +652,7 @@ void MainWindow::closeCurrentFile()
{
/* free the dives and trips */
clear_git_id();
MultiFilterSortModel::instance()->clear();
MultiFilterSortModel::instance()->clear(); // this clears all the core data structures
setCurrentFile(nullptr);
diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);
MapWidget::instance()->reload();
@ -663,8 +662,6 @@ void MainWindow::closeCurrentFile()
setFileClean();
clear_events();
dcList.dcs.clear();
}
void MainWindow::updateCloudOnlineStatus()