nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-16 17:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

SrmRideFile: don't assert() on bad file version

Browse Source 
replaced assert() of file version with graceful error handling.
This commit is contained in:
Rainer Clasen
2014-07-08 06:49:28 +02:00
parent cb152da395
commit 300c51f944
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SrmRideFile.cpp
View File

@@ -268,8 +268,7 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings, QL
watts = (ps[1] & 0x0f) | (ps[2] << 0x4);
alt = 0.0;
}
else {
assert(version == 7);
else if (version == 7 ){
watts = readShort(in);
cad = readByte(in);
hr = readByte(in);
@@ -280,6 +279,11 @@ RideFile *SrmFileReader::openRideFile(QFile &file, QStringList &errorStrings, QL
alt = readSignedLong(in);
temp = 0.1 * readSignedShort(in);
}
else {
errorStrings << QString("unsupported SRM file version: %1")
.arg( version );
return NULL;
}
if (i == 0) {
result->setStartTime(blockhdrs[blknum].dt);