Bugfix: Datebook shouldn't crash if we modify prefences when dayview isn't initialized. :)

1 files changed, 8 insertions, 3 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 1bc82a5..829f8f8 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -277,17 +277,21 @@ void DateBook::slotSettings()
 #endif
 
     if ( frmSettings.exec() ) {
+
 	aPreset = frmSettings.alarmPreset();
 	presetTime = frmSettings.presetTime();
 	startTime = frmSettings.startTime();
 	bJumpToCurTime = frmSettings.jumpToCurTime();
 	rowStyle = frmSettings.rowStyle();
-	if ( dayView )
+
+		if ( dayView ) {
 	    dayView->setStartViewTime( startTime );
 	    dayView->setJumpToCurTime( bJumpToCurTime );
 	    dayView->setRowStyle( rowStyle );
-	if ( weekView )
+		}
+		if ( weekView ) {
 	    weekView->setStartViewTime( startTime );
+		}
 	saveSettings();
 
 	// make the change obvious
@@ -548,10 +552,10 @@ void DateBook::initWeek()
 	connect( this, SIGNAL( newEvent() ),
 		 weekView, SLOT( redraw() ) );
     }
+
     //But also get it right: the year that we display can be different
     //from the year of the current date. So, first find the year
     //number of the current week.
-
     int yearNumber, totWeeks;
     calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
@@ -565,6 +569,7 @@ void DateBook::initWeek()
     if ( totWeeks != weekView->totalWeeks() )
 	weekView->setTotalWeeks( totWeeks );
 }
+
 void DateBook::initWeekLst() {
   if ( !weekLstView ) {
       weekLstView = new DateBookWeekLst( ampm, onMonday, db,