From 8d42d33f93c2eec54013c984cd902f094eb9d25f Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Sun, 28 May 2017 14:02:26 +0200 Subject: [PATCH] mobile: Prevent tripping assert on empty BT download When (with mobile on desktop) loading from DC is called and the dive computer to connect to is not in download mode, the repopulate() function is called with an empty dive table. This trips the assert (obviously, debug compile only) in DiveImportedModel::setImportedDivesIndexes(). This simple fix makes things just more robust. Signed-off-by: Jan Mulder --- qt-models/diveimportedmodel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index c1f4f7525..1b8b5a897 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -140,7 +140,10 @@ void DiveImportedModel::setImportedDivesIndexes(int first, int last) void DiveImportedModel::repopulate() { - setImportedDivesIndexes(0, diveTable->nr-1); + if (diveTable->nr) + setImportedDivesIndexes(0, diveTable->nr-1); + else + setImportedDivesIndexes(0, 0); } void DiveImportedModel::recordDives()