| -rw-r--r-- | korganizer/kojournalview.cpp | 1 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 51ae0a0..7a96aa5 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -111,25 +111,24 @@ void KOJournalView::updateConfig() } void KOJournalView::updateView() { JournalEntry* mEntry = jEntries.first(); while ( mEntry ) { mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); mEntry = jEntries.next(); } showDates( mDate, QDate() ); } void KOJournalView::checkModified() { - qDebug("checkmod "); flushView(); } void KOJournalView::flushView() { static bool ff = false; if ( ff ) return; ff = true; JournalEntry* mEntry = jEntries.first(); while ( mEntry ) { mEntry->flushEntry(); mEntry = jEntries.next(); } diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index fb6d6ec..23537a6 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1826,28 +1826,26 @@ void MainWindow::saveOnClose() if ( p->mToolBarHorN ) p->mToolBarUpN = navigatorToolBar->y() > height()/2; else p->mToolBarUpN = navigatorToolBar->x() > width()/2 ; if ( filterToolBar ) { if ( p->mToolBarHorF ) p->mToolBarUpF = filterToolBar->y() > height()/2; else p->mToolBarUpF = filterToolBar->x() > width()/2 ; } #endif - if ( mView->viewManager()->journalView() ) - mView->viewManager()->journalView()->checkModified(); - if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName())) - save(); + + save(); mView->writeSettings(); } void MainWindow::slotModifiedChanged( bool changed ) { if ( mBlockAtStartup ) return; int msec; // we store the changes after 1 minute, // and for safety reasons after 10 minutes again if ( !mSyncManager->blockSave() ) msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000; |