From 627ac8b899ccf18d24ed224ef7634fd31cab62c3 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Tue, 11 Jul 2023 20:01:05 -0400 Subject: [PATCH] Moved lawicel autodetector down the list as it is a bit overly generic and falsely loaded some files it shouldn't. --- framefileio.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/framefileio.cpp b/framefileio.cpp index e0da8fd..658cb31 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -369,16 +369,6 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } - qDebug() << "Attempting lawicel"; - if (isLawicelFile(filename)) - { - if (loadLawicelFile(filename, frames)) - { - qDebug() << "Loaded as lawicel successfully!"; - return true; - } - } - qDebug() << "Attempting 'CARBUS Analyzer'"; if (isCARBUSAnalyzerFile(filename)) { @@ -494,6 +484,16 @@ bool FrameFileIO::autoDetectLoadFile(QString filename, QVector* frames } } + qDebug() << "Attempting lawicel"; + if (isLawicelFile(filename)) + { + if (loadLawicelFile(filename, frames)) + { + qDebug() << "Loaded as lawicel successfully!"; + return true; + } + } + qDebug() << "Attempting generic CSV"; if (isGenericCSVFile(filename)) {