Fixed seqfault after sync config

1 files changed, 8 insertions, 5 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9e326a1..d8aa43a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -842,25 +842,26 @@ void MainWindow::initActions()
     if (!p-> mShowIconStretch)
         iconToolBar->setStretchableWidget ( dummy ) ;
     else
         configureToolBarMenu->setItemChecked( 5, true );
     if (p-> mShowIconWhatsThis)
         QWhatsThis::whatsThisButton (  iconToolBar );
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 void MainWindow::fillSyncMenu()
 {
-    syncMenu->clear();
+    if ( syncMenu->count() )
+        syncMenu->clear();
     syncMenu->insertItem( i18n("Configure..."), 0 );
     syncMenu->insertSeparator();
     syncMenu->insertItem( i18n("Multiple sync"), 1 );
     syncMenu->insertSeparator();
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 3 ) {
         prof.clear();
         prof << i18n("Sharp_DTM");
         prof << i18n("Local_file");
@@ -979,25 +980,30 @@ void MainWindow::multiSync( bool askforPrefs  )
         save();
     if ( num )
         setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
     else
         setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 void MainWindow::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
-        confSync();
+        // seems to be a Qt2 event handling bug
+        // syncmenu.clear causes a segfault at first time
+        // when we call it after the main event loop, it is ok
+        // same behaviour when calling OM/Pi via QCOP for the first time
+        QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
+        //confSync();
 
         return;
     }
     if ( action == 1 ) {
         multiSync( true );
         return;
     }
 
     if (mBlockSaveFlag)
         return;
     mBlockSaveFlag = true;
     mCurrentSyncProfile = action - 1000 ;
@@ -1903,27 +1909,24 @@ void MainWindow::quickSyncLocalFile()
        //  Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( i18n("Quick with file: ")+ KOPrefs::instance()->mLastSyncedLocalFile);
 //         e->setReadOnly( true );
 
     }
 }
 
 void MainWindow::confSync()
 {
     mView->confSync();
     fillSyncMenu();
-    //mView->writeSettings();
-
-
 }
 void MainWindow::syncRemote( KSyncProfile* prof,  bool ask)
 {
     QString question;
     if ( ask ) {
     question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
     if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 )
         return;
     }