author | zautrix <zautrix> | 2005-05-25 09:43:34 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-05-25 09:43:34 (UTC) |
commit | ce9b826d7c0d9249751f8fb7b791c3757aff3c39 (patch) (unidiff) | |
tree | 719bc7dea987d15c1ee38de58c5b2902c8e0a5ab /korganizer | |
parent | 75c935404e0a803b7d39dd0cf4d83d4d6cd07da2 (diff) | |
download | kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.zip kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.tar.gz kdepimpi-ce9b826d7c0d9249751f8fb7b791c3757aff3c39.tar.bz2 |
fix
-rw-r--r-- | korganizer/calendarview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a8ad467..503ef12 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1,16 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | 3 | ||
4 | Requires the Qt and KDE widget libraries, available at no cost at | 4 | Requires the Qt and KDE widget libraries, available at no cost at |
5 | http://www.troll.no and http://www.kde.org respectively | 5 | http://www.troll.no and http://www.kde.org respectively |
6 | 6 | ||
7 | Copyright (c) 1997, 1998, 1999 | 7 | Copyright (c) 1997, 1998, 1999 |
8 | Preston Brown (preston.brown@yale.edu) | 8 | Preston Brown (preton.brown@yale.edu) |
9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) | 9 | Fester Zigterman (F.J.F.ZigtermanRustenburg@student.utwente.nl) |
10 | Ian Dawes (iadawes@globalserve.net) | 10 | Ian Dawes (iadawes@globalserve.net) |
11 | Laszlo Boloni (boloni@cs.purdue.edu) | 11 | Laszlo Boloni (boloni@cs.purdue.edu) |
12 | 12 | ||
13 | Copyright (c) 2000, 2001, 2002 | 13 | Copyright (c) 2000, 2001, 2002 |
14 | Cornelius Schumacher <schumacher@kde.org> | 14 | Cornelius Schumacher <schumacher@kde.org> |
15 | 15 | ||
16 | This program is free software; you can redistribute it and/or modify | 16 | This program is free software; you can redistribute it and/or modify |
@@ -1654,18 +1654,19 @@ bool CalendarView::openCalendar(QString filename, bool merge) | |||
1654 | 1654 | ||
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) { | 1661 | if (!merge) { |
1662 | mCalendar->close(); | ||
1663 | mTodoList->clearList(); | 1662 | mTodoList->clearList(); |
1663 | mViewManager->setDocumentId( filename ); | ||
1664 | mCalendar->close(); | ||
1664 | } | 1665 | } |
1665 | mStorage->setFileName( filename ); | 1666 | mStorage->setFileName( filename ); |
1666 | 1667 | ||
1667 | if ( mStorage->load() ) { | 1668 | if ( mStorage->load() ) { |
1668 | if ( merge ) ;//setModified( true ); | 1669 | if ( merge ) ;//setModified( true ); |
1669 | else { | 1670 | else { |
1670 | //setModified( true ); | 1671 | //setModified( true ); |
1671 | mViewManager->setDocumentId( filename ); | 1672 | mViewManager->setDocumentId( filename ); |