author | umopapisdn <umopapisdn> | 2003-04-12 01:19:53 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-04-12 01:19:53 (UTC) |
commit | 212aef7fd20182fe926644af2ab10a4b49549440 (patch) (unidiff) | |
tree | 9e8fb96b40037b31cb2eed411c7a51f35d819ddc | |
parent | 79fcbf52d267aa3eb839de35f15992bf5e18f8eb (diff) | |
download | opie-212aef7fd20182fe926644af2ab10a4b49549440.zip opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.gz opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.bz2 |
Bugfix: Datebook shouldn't crash if we modify prefences when dayview isn't initialized. :)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 11 |
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 | |||
@@ -279,2 +279,3 @@ void DateBook::slotSettings() | |||
279 | if ( frmSettings.exec() ) { | 279 | if ( frmSettings.exec() ) { |
280 | |||
280 | aPreset = frmSettings.alarmPreset(); | 281 | aPreset = frmSettings.alarmPreset(); |
@@ -284,3 +285,4 @@ void DateBook::slotSettings() | |||
284 | rowStyle = frmSettings.rowStyle(); | 285 | rowStyle = frmSettings.rowStyle(); |
285 | if ( dayView ) | 286 | |
287 | if ( dayView ) { | ||
286 | dayView->setStartViewTime( startTime ); | 288 | dayView->setStartViewTime( startTime ); |
@@ -288,4 +290,6 @@ void DateBook::slotSettings() | |||
288 | dayView->setRowStyle( rowStyle ); | 290 | dayView->setRowStyle( rowStyle ); |
289 | if ( weekView ) | 291 | } |
292 | if ( weekView ) { | ||
290 | weekView->setStartViewTime( startTime ); | 293 | weekView->setStartViewTime( startTime ); |
294 | } | ||
291 | saveSettings(); | 295 | saveSettings(); |
@@ -550,2 +554,3 @@ void DateBook::initWeek() | |||
550 | } | 554 | } |
555 | |||
551 | //But also get it right: the year that we display can be different | 556 | //But also get it right: the year that we display can be different |
@@ -553,3 +558,2 @@ void DateBook::initWeek() | |||
553 | //number of the current week. | 558 | //number of the current week. |
554 | |||
555 | int yearNumber, totWeeks; | 559 | int yearNumber, totWeeks; |
@@ -567,2 +571,3 @@ void DateBook::initWeek() | |||
567 | } | 571 | } |
572 | |||
568 | void DateBook::initWeekLst() { | 573 | void DateBook::initWeekLst() { |