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
@@ -264,43 +264,47 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
 DateBook::~DateBook()
 {
 }
 
 void DateBook::slotSettings()
 {
     DateBookSettings frmSettings( ampm, this );
     frmSettings.setStartTime( startTime );
     frmSettings.setAlarmPreset( aPreset, presetTime );
     frmSettings.setJumpToCurTime( bJumpToCurTime );
     frmSettings.setRowStyle( rowStyle );
 #if defined (Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #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
 	if ( views->visibleWidget() ) {
 	    if ( views->visibleWidget() == dayView )
 		dayView->redraw();
 	    else if ( views->visibleWidget() == weekView )
 		weekView->redraw();
 	}
     }
 }
 
 void DateBook::fileNew()
 {
     slotNewEventFromKey("");
 }
@@ -535,49 +539,50 @@ void DateBook::initDay()
 	connect( dayView, SIGNAL(sigNewEvent(const QString &)),
 		 this, SLOT(slotNewEventFromKey(const QString &)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
 	weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
 	weekView->setStartViewTime( startTime );
 	views->addWidget( weekView, WEEK );
 	connect( weekView, SIGNAL( showDate( int, int, int ) ),
 		 this, SLOT( showDay( int, int, int ) ) );
 	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 );
 
     QDate d = QDate( yearNumber, 12, 31 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
 
     while ( totWeeks == 1 ) {
 	d = d.addDays( -1 );
 	calcWeek( d, totWeeks, yearNumber, onMonday );
     }
     if ( totWeeks != weekView->totalWeeks() )
 	weekView->setTotalWeeks( totWeeks );
 }
+
 void DateBook::initWeekLst() {
   if ( !weekLstView ) {
       weekLstView = new DateBookWeekLst( ampm, onMonday, db,
 					 views, "weeklst view" );
       views->addWidget( weekLstView, WEEKLST );
 
       //weekLstView->setStartViewTime( startTime );
       connect( weekLstView, SIGNAL( showDate( int, int, int ) ),
 	       this, SLOT( showDay( int, int, int ) ) );
       connect( weekLstView, SIGNAL( addEvent( const QDateTime &,
 					      const QDateTime &,
 					      const QString & , const QString &) ),
 	       this, SLOT( slotNewEntry( const QDateTime &,
 					 const QDateTime &,
 					 const QString & , const QString &) ) );
       connect( this, SIGNAL( newEvent() ),