2 files changed, 24 insertions, 11 deletions

diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index de07496..f7d40ad 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -88,57 +88,69 @@ void Todo::stopRunning()
 void Todo::setRunning( bool run )
 {
     if ( run == mRunning )
         return;
     //qDebug("Todo::setRunning %d ", run);
     if ( !mRunSaveTimer ) {
         mRunSaveTimer = new QTimer ( this );
         connect ( mRunSaveTimer, SIGNAL( timeout() ), this , SLOT ( timerSlotSaveRunningInfoToFile() ) );
     }
     mRunning = run;
     mRunLastSave = QDateTime::currentDateTime();
     if ( mRunning ) {
-        mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
+        restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
         mRunStart = QDateTime::currentDateTime();
-        mRunLastSave = QDateTime::currentDateTime();
-        mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS;
     } else {
         mRunSaveTimer->stop();
         saveRunningInfoToFile();
     }
 }
 void Todo::saveRunningInfo( QString comment, QDateTime start, QDateTime end )
 {
     if ( !mRunning) return;
     mRunning = false;
     mRunStart = start;
     mRunEnd = end;
     saveRunningInfoToFile( comment );
 }
+void Todo::restartSaveTimer( int secs )
+{
+    mRunSaveTimer->start( secs * 1000 ); 
+    mRunLastSave = QDateTime::currentDateTime();
+    mCurrentTimerDelay = secs;
+}
 void Todo::timerSlotSaveRunningInfoToFile()
 {
     mRunEnd = QDateTime::currentDateTime();
     int secsTo = mRunLastSave.secsTo( mRunEnd );
-    if( secsTo == 8 ) ++secsTo;
+    //if( secsTo == 8 ) ++secsTo;
     qDebug("KO Todo::saveTimerTimeout %d %d",  secsTo, mCurrentTimerDelay );
     if ( secsTo > mCurrentTimerDelay  ) {
-    qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS );
-        mRunSaveTimer->start( SAVETIMER_TIMEOUT_RETRY_SECONDS * 1000 ); 
-        mRunLastSave = QDateTime::currentDateTime();
-        mCurrentTimerDelay = SAVETIMER_TIMEOUT_RETRY_SECONDS;
+        qDebug("KO Todo::saveTimerTimeout restart %d ", SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
         return;
     }
-    mRunSaveTimer->start( SAVETIMER_TIMEOUT_SECONDS * 1000 ); // 5 min
-    mRunLastSave = QDateTime::currentDateTime();
-    mCurrentTimerDelay = SAVETIMER_TIMEOUT_SECONDS;
+    int msecs =  mRunLastSave.time().msecsTo( mRunEnd.time());
+    if ( msecs < 0 ) {
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        return;
+    }  
+    // qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d",  msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) );
+    if ( msecs > ( ( mCurrentTimerDelay * 1000 ) + 50 )) {
+        qDebug("KO Todo::saveTimerTimeout restarting! millisecs %d",  msecs - ( ( mCurrentTimerDelay * 1000 ) + 50 ) );
+        restartSaveTimer( SAVETIMER_TIMEOUT_RETRY_SECONDS );
+        return;
+
+    }
+    restartSaveTimer( SAVETIMER_TIMEOUT_SECONDS );
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile()
 {
     mRunEnd = QDateTime::currentDateTime();
     saveRunningInfoToFile( QString::null );
 }
 void Todo::saveRunningInfoToFile( QString comment )
 {
     //qDebug("Todo::saveRunningInfoToFile() %s", summary().latin1());
     if ( mRunStart.secsTo ( mRunEnd) < 15   )  {
         qDebug("Running time < 15 seconds. Skipped. ");
diff --git a/libkcal/todo.h b/libkcal/todo.h
index e6b8a21..71b7a4e 100644
--- a/libkcal/todo.h
+++ b/libkcal/todo.h
@@ -125,24 +125,25 @@ namespace KCal {
     void stopRunning();
     int runTime();
     QDateTime runStart () const { return mRunStart;}
     void saveRunningInfo( QString comment, QDateTime start, QDateTime end );
     public slots:
     void saveRunningInfoToFile( QString st );
     void saveRunningInfoToFile( );
     void saveParents();
     QString durationText();
   private slots:
     void timerSlotSaveRunningInfoToFile( );
   private:
+    void restartSaveTimer( int secs );
     int mCurrentTimerDelay;
     bool mRunning;
     QTimer * mRunSaveTimer;
     QDateTime mRunStart;
     QDateTime mRunLastSave;
     QDateTime mRunEnd;
     bool accept(Visitor &v) { return v.visit(this); }
 
     QDateTime mDtDue;                     // due date of todo
 
     bool mHasDueDate;                    // if todo has associated due date