summaryrefslogtreecommitdiff
path: root/library
authoreilers <eilers>2003-03-24 17:24:44 (UTC)
committer eilers <eilers>2003-03-24 17:24:44 (UTC)
commit84372ba20c0b1b09c1606212ec66c9d04588b90e (patch) (unidiff)
tree36c4d861596c80b537c765af3f0c16495a763cc6 /library
parent38d8d91e11c191f89429f4a3da8c1ada84b2a885 (diff)
downloadopie-84372ba20c0b1b09c1606212ec66c9d04588b90e.zip
opie-84372ba20c0b1b09c1606212ec66c9d04588b90e.tar.gz
opie-84372ba20c0b1b09c1606212ec66c9d04588b90e.tar.bz2
Small anti-crash fix: Sync with QtopiaDesktop caused a big mess. But this
mess should't crash datebook. Therefore this fix prevents datebook to hang if rweekdays=="0"
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/datebookdb.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index a26fe8f..0fedfa8 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -832,25 +832,30 @@ void DateBookDB::loadFile( const QString &strFile )
832 else if ( value == "Weekly" ) 832 else if ( value == "Weekly" )
833 rp.type = Event::Weekly; 833 rp.type = Event::Weekly;
834 else if ( value == "MonthlyDay" ) 834 else if ( value == "MonthlyDay" )
835 rp.type = Event::MonthlyDay; 835 rp.type = Event::MonthlyDay;
836 else if ( value == "MonthlyDate" ) 836 else if ( value == "MonthlyDate" )
837 rp.type = Event::MonthlyDate; 837 rp.type = Event::MonthlyDate;
838 else if ( value == "Yearly" ) 838 else if ( value == "Yearly" )
839 rp.type = Event::Yearly; 839 rp.type = Event::Yearly;
840 else 840 else
841 rp.type = Event::NoRepeat; 841 rp.type = Event::NoRepeat;
842 break; 842 break;
843 case FRWeekdays: 843 case FRWeekdays:
844 rp.days = value.toInt(); 844 // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"'
845 // when it goes mad. This causes datebook to crash.. (se)
846 if ( value.toInt() != 0 )
847 rp.days = value.toInt();
848 else
849 rp.days = 1;
845 break; 850 break;
846 case FRPosition: 851 case FRPosition:
847 rp.position = value.toInt(); 852 rp.position = value.toInt();
848 break; 853 break;
849 case FRFreq: 854 case FRFreq:
850 rp.frequency = value.toInt(); 855 rp.frequency = value.toInt();
851 break; 856 break;
852 case FRHasEndDate: 857 case FRHasEndDate:
853 rp.hasEndDate = value.toInt(); 858 rp.hasEndDate = value.toInt();
854 break; 859 break;
855 case FREndDate: { 860 case FREndDate: {
856 rp.endDateUTC = (time_t) value.toLong(); 861 rp.endDateUTC = (time_t) value.toLong();