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"

1 files changed, 5 insertions, 0 deletions

diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index a26fe8f..0fedfa8 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -820,49 +820,54 @@ void DateBookDB::loadFile( const QString &strFile )
 		    e.setType( Event::Normal );
 		break;
 	    case FAlarm:
 		alarmTime = value.toInt();
 		break;
 	    case FSound:
 		alarmSound = value == "loud" ? Event::Loud : Event::Silent;
 		break;
 		// recurrence stuff
 	    case FRType:
 		if ( value == "Daily" )
 		    rp.type = Event::Daily;
 		else if ( value == "Weekly" )
 		    rp.type = Event::Weekly;
 		else if ( value == "MonthlyDay" )
 		    rp.type = Event::MonthlyDay;
 		else if ( value == "MonthlyDate" )
 		    rp.type = Event::MonthlyDate;
 		else if ( value == "Yearly" )
 		    rp.type = Event::Yearly;
 		else
 		    rp.type = Event::NoRepeat;
 		break;
 	    case FRWeekdays:
+		    // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"'
+		    // when it goes mad. This causes datebook to crash.. (se)
+		    if ( value.toInt() != 0 ) 
 		rp.days = value.toInt();
+		    else
+			    rp.days = 1;
 		break;
 	    case FRPosition:
 		rp.position = value.toInt();
 		break;
 	    case FRFreq:
 		rp.frequency = value.toInt();
 		break;
 	    case FRHasEndDate:
 		rp.hasEndDate = value.toInt();
 		break;
 		case FREndDate: {
 		rp.endDateUTC = (time_t) value.toLong();
 		break;
 		}
 		case FRStart: {
 		e.setStart( (time_t) value.toLong() );
 		break;
 		}
 		case FREnd: {
 		e.setEnd( (time_t) value.toLong() );
 		break;
 		}
 	    case FNote:
 		e.setNotes( value );