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

List:       kde-commits
Subject:    KDE/kdepimlibs/kcal
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-06-20 1:36:49
Message-ID: 20100620013649.1F257AC8DA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1140149 by smartins:

Fwd port r1140147 bby smartins from branch 4.4 to trunk:

Don't crash when formating an incidence.
BUG: 236462
BUG: 242191

MERGE: e35



 M  +4 -0      incidenceformatter.cpp  


--- trunk/KDE/kdepimlibs/kcal/incidenceformatter.cpp #1140148:1140149
@@ -3550,6 +3550,7 @@
   }
   case Recurrence::rMonthlyPos:
   {
+    if ( !recur->monthPositions().isEmpty() ) {
     KCal::RecurrenceRule::WDayPos rule = recur->monthPositions()[0];
     if ( recur->duration() != -1 ) {
       txt = i18ncp( "Recurs every N months on the [2nd|3rd|...]"
@@ -3574,8 +3575,10 @@
                    dayList[rule.pos() + 31],
                    calSys->weekDayName( rule.day(), KCalendarSystem::LongDayName ) );
   }
+  }
   case Recurrence::rMonthlyDay:
   {
+    if ( !recur->monthDays().isEmpty() ) {
     int days = recur->monthDays()[0];
     if ( recur->duration() != -1 ) {
         txt = i18ncp( "Recurs monthly on the [1st|2nd|...] day until end-date",
@@ -3597,6 +3600,7 @@
                    recur->frequency(),
                    dayList[days + 31] );
   }
+  }
   case Recurrence::rYearlyMonth:
   {
     if ( recur->duration() != -1 ) {
[prev in list] [next in list] [prev in thread] [next in thread]