From kde-commits  Sun Feb 28 22:59:50 2010
From: Allen Winter <winter () kde ! org>
Date: Sun, 28 Feb 2010 22:59:50 +0000
To: kde-commits
Subject: branches/kdepim/enterprise/kdepim/korganizer
Message-Id: <1267397990.374554.13119.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=126745009629162

SVN commit 1097339 by winterz:

fix due date computation for recurring to-dos when an active date is specified.
kolab/issue4110
MERGE: trunk


 M  +3 -1      koeditorgeneraltodo.cpp  


--- branches/kdepim/enterprise/kdepim/korganizer/koeditorgeneraltodo.cpp #1097338:1097339
@@ -291,7 +291,9 @@
     enableAlarm( true );
     dueDT = todo->dtDue();
     if ( todo->doesRecur() && date.isValid() ) {
-      dueDT.addDays( todo->dtDue().date().daysTo( date ) );
+      QDateTime dt( date, QTime( 0, 0, 0 ) );
+      dt = dt.addSecs( -1 );
+      dueDT.setDate( todo->recurrence()->getNextDateTime( dt ).date() );
     }
     mDueDateEdit->setDate(dueDT.date());
     mDueTimeEdit->setTime(dueDT.time());