From f3ab2ee674846ea2934de5cd6e2822cdb5143421 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Mon, 11 Sep 2017 06:46:13 +0300 Subject: [PATCH] Fix crash on manually added ZXU/DL7 file The CSV import crashed if the input file had no samples in it. Fixes #566 Signed-off-by: Miika Turkia --- desktop-widgets/divelogimportdialog.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp index e4f4899eb..6473e46ed 100644 --- a/desktop-widgets/divelogimportdialog.cpp +++ b/desktop-widgets/divelogimportdialog.cpp @@ -737,7 +737,9 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) fileColumns.append(currColumns); rows += 1; } - resultModel->setColumnValues(fileColumns); + + if (rows > 0) + resultModel->setColumnValues(fileColumns); for (int i = 0; i < headers.count(); i++) if (!headers.at(i).isEmpty()) resultModel->setData(resultModel->index(0, i),headers.at(i),Qt::EditRole);