-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 904bbe2..a8ad467 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1655,14 +1655,16 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1655 | if (!QFile::exists(filename)) { | 1655 | if (!QFile::exists(filename)) { |
1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1656 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
1657 | return false; | 1657 | return false; |
1658 | } | 1658 | } |
1659 | 1659 | ||
1660 | globalFlagBlockAgenda = 1; | 1660 | globalFlagBlockAgenda = 1; |
1661 | if (!merge) mCalendar->close(); | 1661 | if (!merge) { |
1662 | 1662 | mCalendar->close(); | |
1663 | mTodoList->clearList(); | ||
1664 | } | ||
1663 | mStorage->setFileName( filename ); | 1665 | mStorage->setFileName( filename ); |
1664 | 1666 | ||
1665 | if ( mStorage->load() ) { | 1667 | if ( mStorage->load() ) { |
1666 | if ( merge ) ;//setModified( true ); | 1668 | if ( merge ) ;//setModified( true ); |
1667 | else { | 1669 | else { |
1668 | //setModified( true ); | 1670 | //setModified( true ); |