From 788fbc17fdffa87a9bdcca141bdda1836040cc1d Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 7 May 2011 11:26:59 +0100 Subject: [PATCH] Refresh CPX file when importing ride files. --- src/MetricAggregator.cpp | 1 + src/RideFileCache.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MetricAggregator.cpp b/src/MetricAggregator.cpp index f810509b3..0f2e51257 100644 --- a/src/MetricAggregator.cpp +++ b/src/MetricAggregator.cpp @@ -183,6 +183,7 @@ void MetricAggregator::refreshMetrics() void MetricAggregator::addRide(RideItem*ride) { importRide(main->home, ride->ride(), ride->fileName, main->zones()->getFingerprint(), true); + RideFileCache updater(main, home.absolutePath() + "/" + ride->fileName, ride->ride(), true); // update cpx etc dataChanged(); // notify models/views } diff --git a/src/RideFileCache.cpp b/src/RideFileCache.cpp index 7544ba767..923046f50 100644 --- a/src/RideFileCache.cpp +++ b/src/RideFileCache.cpp @@ -57,9 +57,8 @@ RideFileCache::RideFileCache(MainWindow *main, QString fileName, RideFile *passe QFileInfo cacheFileInfo(cacheFileName); // is it up-to-date? - if (cacheFileInfo.exists() && rideFileInfo.lastModified() < cacheFileInfo.lastModified() && + if (cacheFileInfo.exists() && rideFileInfo.lastModified() <= cacheFileInfo.lastModified() && cacheFileInfo.size() >= (int)sizeof(struct RideFileCacheHeader)) { - // we have a file, it is more recent than the ride file // but is it the latest version? RideFileCacheHeader head;