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

MergeActivityWizard: don't crash if no data to merge

Browse Source
This commit is contained in:
Damien
2013-12-30 00:10:49 +01:00
parent 5822ff2ee8
commit 642d990ec7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MergeActivityWizard.cpp
View File

@@ -270,10 +270,12 @@ QVector<DataPoint*>
MergeSync::getSamplesForRide(RideFile *ride1)
{
QVector<DataPoint*> sample;
if (!ride1->isDataPresent(RideFile::secs))
return sample;
int index = 0;
double minTime = ride1->getPointValue(0, RideFile::secs);
double minTime = ride1->getMinPoint(RideFile::secs).toDouble();
double maxTime = ride1->getMaxPoint(RideFile::secs).toDouble();
DataPoint *previousPoint = 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));