From a05e37188b5197f04b2cb68cf2df49994a758362 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 24 Jul 2015 13:18:30 -0700 Subject: 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 --- qt-mobile/qmlmanager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'qt-mobile') diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index 8cefbe95f..3e09be7c3 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -58,7 +58,7 @@ void QMLManager::loadDives() showMessage(get_error_string()); return; } - showMessage("got email / password"); + clear_dive_file_data(); QByteArray fileNamePrt = QFile::encodeName(url); int error = parse_file(fileNamePrt.data()); @@ -70,11 +70,13 @@ void QMLManager::loadDives() showMessage(get_error_string()); } process_dives(false, false); + int i; struct dive *d; - for_each_dive(i, d) - DiveListModel::instance()->addDive(d); + for_each_dive(i, d) { + DiveListModel::instance()->addDive(d); + } } void QMLManager::commitChanges(QString diveId, QString suit, QString buddy, QString diveMaster, QString notes) -- cgit v1.2.3-70-g09d2