3 files changed, 18 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 3635cfa..eaea040 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1513,9 +1513,9 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
         updateUnmanagedViews();
         updateView();
-        if (  filename != MainWindow::defaultFileName() )
+        if (  filename != MainWindow::defaultFileName() ) 
             saveCalendar( MainWindow::defaultFileName() );
         loadedFileVersion = QDateTime::currentDateTime();
         return true;
     } else {
@@ -1544,8 +1544,21 @@ bool CalendarView::checkFileChanged(QString fn)
         return false;
     return true;
 
 }
+void CalendarView::watchSavedFile()
+{
+  QFileInfo finf ( MainWindow::defaultFileName());   
+  if ( !finf.exists() )
+    return;
+  QDateTime dt = finf.lastModified ();
+  if ( dt < loadedFileVersion ) {
+    QTimer::singleShot( 1000 , this, SLOT ( watchSavedFile()  ) );
+    return;
+  }
+  loadedFileVersion = dt;
+}
+
 bool CalendarView::checkFileVersion(QString fn)
 {
     QFileInfo finf ( fn );  
     if ( !finf.exists() )
@@ -1554,9 +1567,9 @@ bool CalendarView::checkFileVersion(QString fn)
     //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
     //qDebug("file on disk version  %s",dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
-   int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, false)) ,
+   int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index a3315ad..355bb84 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -171,8 +171,9 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void updateSearchDialog();
 
 
   public slots:
+    void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
     void addAlarm(const QDateTime &qdt, const QString &noti  );
     void addSuspendAlarm(const QDateTime &qdt, const QString &noti  );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 1c4a186..6315c64 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1407,12 +1407,13 @@ void MainWindow::save()
 
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
+        mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
         mView->saveCalendar( defaultFileName() );
 
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
-        mView->setLoadedFileVersion(QDateTime::currentDateTime());
+        mView->watchSavedFile();
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);