[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/geodata/data: only remove points with valid time
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.76867580D1 () git ! kde ! org
[Download RAW message or body]

Git commit db6c08b5a0e41ac61375e498071138104de924cf by Niko Sams.
Committed on 10/12/2011 at 08:34.
Pushed by nsams into branch 'master'.

only remove points with valid time

M  +2    -2    src/lib/geodata/data/GeoDataTrack.cpp

http://commits.kde.org/marble/db6c08b5a0e41ac61375e498071138104de924cf

diff --git a/src/lib/geodata/data/GeoDataTrack.cpp b/src/lib/geodata/data/GeoDataTrack.cpp
index ca5a7c0..eab9142 100644
--- a/src/lib/geodata/data/GeoDataTrack.cpp
+++ b/src/lib/geodata/data/GeoDataTrack.cpp
@@ -211,7 +211,7 @@ void GeoDataTrack::clear()
 void GeoDataTrack::removeBefore( const QDateTime &when )
 {
     for ( int i = 0; i < qMin( d->m_when.size(), d->m_coordinates.size() ); ++i ) {
-        if ( d->m_when.at( i ) < when ) {
+        if ( d->m_when.at( i ).isValid() && d->m_when.at( i ) < when ) {
             d->m_when.removeAt( i );
             if ( i < d->m_coordinates.size() ) {
                 d->m_coordinates.removeAt( i );
@@ -224,7 +224,7 @@ void GeoDataTrack::removeBefore( const QDateTime &when )
 void GeoDataTrack::removeAfter( const QDateTime &when )
 {
     for ( int i = 0; i < d->m_when.size(); ++i ) {
-        if ( d->m_when.at( i ) > when ) {
+        if ( d->m_when.at( i ).isValid() && d->m_when.at( i ) > when ) {
             d->m_when.removeAt( i );
             if ( i < d->m_coordinates.size() ) {
                 d->m_coordinates.removeAt( i );

[prev in list] [next in list] [prev in thread] [next in thread]