diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-06-16 12:52:39 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-06-16 14:41:56 -0700 |
| commit | ccc9d800153ad11d8a2b54dc75fe8aefb5650dd3 (patch) | |
| tree | 31a3638cd0885515709ab2aa55a3499746a1d2a8 /qt-ui/divelogimportdialog.cpp | |
| parent | bd11988f74d2fcc7873df691e06a1279d7fd3228 (diff) | |
| download | subsurface-ccc9d800153ad11d8a2b54dc75fe8aefb5650dd3.tar.gz | |
Remove all the no longer necessary code that aborts read of first V2 file
This was a poorly implemented hack when we executed the reverse geo lookup
in the main thread and opening a V2 file could take a very long time. We
need to do the "Welcome" message quite differently.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/divelogimportdialog.cpp')
| -rw-r--r-- | qt-ui/divelogimportdialog.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index 409064833..d3bb5e7a7 100644 --- a/qt-ui/divelogimportdialog.cpp +++ b/qt-ui/divelogimportdialog.cpp @@ -574,7 +574,6 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy) void DiveLogImportDialog::on_buttonBox_accepted() { - imported_via_xslt = true; QStringList r = resultModel->result(); if (ui->knownImports->currentText() != "Manual import") { for (int i = 0; i < fileNames.size(); ++i) { @@ -594,7 +593,6 @@ void DiveLogImportDialog::on_buttonBox_accepted() ui->CSVUnits->currentIndex(), delta.toUtf8().data() ) < 0) { - imported_via_xslt = false; return; } // Seabear CSV stores NDL and TTS in Minutes, not seconds @@ -670,7 +668,6 @@ void DiveLogImportDialog::on_buttonBox_accepted() } process_dives(true, false); MainWindow::instance()->refreshDisplay(); - imported_via_xslt = false; } TagDragDelegate::TagDragDelegate(QObject *parent) : QStyledItemDelegate(parent) |