1 files changed, 6 insertions, 3 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b9d8742..68233e8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -173,7 +173,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
-    KPimGlobalPrefs::instance()->setGlobalConfig();
+    //KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
@@ -1723,7 +1723,7 @@ void MainWindow::importOL()
 }
 void MainWindow::importBday()
 {
-    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
+    int result = QMessageBox::warning( this, i18n("KO/Pi import information!"),
                                        i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                        i18n("Import!"), i18n("Cancel"), 0,
                                        0, 1 );
@@ -2310,7 +2310,6 @@ void MainWindow::configureAgenda( int item )
 
 void  MainWindow::saveCalendar()
 {
-    
     QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
     if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
         bupDir = KGlobalSettings::backupDataDir();
@@ -2319,6 +2318,10 @@ void  MainWindow::saveCalendar()
     if ( !KPimGlobalPrefs::instance()->mBackupEnabled )
         bupHint = i18n("(Hint: You can enable automatic backup in the global settings!)");
     if ( KMessageBox::warningContinueCancel( this,  i18n("This will <b>backup all calendar files</b> to the directory %1 %2").arg(bupDir).arg(bupHint),i18n("Information") ) != KMessageBox::Continue ) return;
+    bool enabled = KPimGlobalPrefs::instance()->mBackupEnabled;
+    KPimGlobalPrefs::instance()->mBackupEnabled = false;
+    save();
+    KPimGlobalPrefs::instance()->mBackupEnabled = enabled;
     backupAllFiles();
 }
 void  MainWindow::loadCalendar()