diff --git a/framefileio.cpp b/framefileio.cpp index 38ed8c3..24090d8 100644 --- a/framefileio.cpp +++ b/framefileio.cpp @@ -1454,7 +1454,8 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector* frames) QByteArray bytes(numBytes, 0); thisFrame.isReceived = true; thisFrame.bus = 0; - if (thisFrame.frameId() > 0x10000000) + if ((thisFrame.frameId() > 0x10000000) || + (tokens[3].length() >= 8)) { thisFrame.setExtendedFrameFormat(true); } @@ -1506,7 +1507,8 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector* frames) //qDebug() << thisFrame.payload().length(); thisFrame.isReceived = true; thisFrame.bus = tokens[2].toInt(); - if (thisFrame.frameId() > 0x10000000) + if ((thisFrame.frameId() > 0x10000000) || + (tokens[4].length() >= 8)) { thisFrame.setExtendedFrameFormat(true); } @@ -1548,7 +1550,8 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector* frames) //qDebug() << thisFrame.payload().length(); thisFrame.isReceived = true; thisFrame.bus = 0; - if (thisFrame.frameId() > 0x10000000) + if ((thisFrame.frameId() > 0x10000000) || + (tokens[3].length() >= 8)) { thisFrame.setExtendedFrameFormat(true); } @@ -1600,7 +1603,8 @@ bool FrameFileIO::loadPCANFile(QString filename, QVector* frames) //qDebug() << thisFrame.payload().length(); thisFrame.isReceived = true; thisFrame.bus = tokens[3].toInt(); - if (thisFrame.frameId() > 0x10000000) + if ((thisFrame.frameId() > 0x10000000) || + (tokens[4].length() >= 8)) { thisFrame.setExtendedFrameFormat(true); }