summaryrefslogtreecommitdiffstats
path: root/qt-mobile/qmlmanager.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-mobile/qmlmanager.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-mobile/qmlmanager.cpp')
-rw-r--r--qt-mobile/qmlmanager.cpp8
1 files changed, 5 insertions, 3 deletions
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)