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

MergeActivityWizard : Use recIntSecs

Browse Source
This commit is contained in:
Damien
2013-08-14 16:20:28 +02:00
parent 91d22b1547
commit bb73af34aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MergeActivityWizard.cpp
View File

@@ -296,7 +296,7 @@ MergeSync::getSamplesForRide(RideFile *ride1)
currentPoint = nextPoint;
//watts, cad, kph, alt, hr;
if (secs < maxTime-1)
if (secs < maxTime-ride1->recIntSecs())
nextPoint = new DataPoint(ride1->getPointValue(index, RideFile::secs), ride1->getPointValue(index, RideFile::watts), ride1->getPointValue(index, RideFile::cad), ride1->getPointValue(index, RideFile::kph), ride1->getPointValue(index, RideFile::alt), ride1->getPointValue(index++, RideFile::hr));
}
// next point