1 files changed, 5 insertions, 2 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 98e7481..7887704 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -614,82 +614,84 @@ void Launcher::properties( AppLnk *appLnk )
         LnkProperties prop(appLnk,0 );
 
         QPEApplication::execDialog( &prop );
     }
 }
 
 void Launcher::storageChanged( const QList<FileSystem> &fs )
 {
     // ### update combo boxes if we had a combo box for the storage type
 }
 
 void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "busy()" ) {
         tb->startWait();
     } else if ( msg == "notBusy(QString)" ) {
         QString app;
         stream >> app;
         tabs->setBusy(FALSE);
         tb->stopWait(app);
     } else if (msg == "applyStyle()") {
         tabs->currentView()->relayout();
     }
 }
 
 // These are the update functions from the server
 void Launcher::typeAdded( const QString& type, const QString& name,
                                     const QPixmap& pixmap, const QPixmap& )
 {
     tabs->newView( type, pixmap, name );
     ids.append( type );
-    tb->refreshStartMenu();
+    /* this will be called in applicationScanningProgress with value 100! */
+//    tb->refreshStartMenu();
 
     static bool first = TRUE;
     if ( first ) {
         first = FALSE;
         tabs->categoryBar->showTab(type);
     }
 
     tabs->view( type )->setUpdatesEnabled( FALSE );
     tabs->view( type )->setSortEnabled( FALSE );
 }
 
 void Launcher::typeRemoved( const QString& type )
 {
     tabs->view( type )->removeAllItems();
     tabs->deleteView( type );
     ids.remove( type );
-    tb->refreshStartMenu();
+    /* this will be called in applicationScanningProgress with value 100! */
+//    tb->refreshStartMenu();
 }
 
 void Launcher::applicationAdded( const QString& type, const AppLnk& app )
 {
     if ( app.type() == "Separator" )  // No tr
         return;
 
     LauncherView *view = tabs->view( type );
     if ( view )
         view->addItem( new AppLnk( app ), FALSE );
     else
         qWarning("addAppLnk: No view for type %s. Can't add app %s!",
                                   type.latin1(),app.name().latin1()  );
 
     MimeType::registerApp( app );
 }
 
 void Launcher::applicationRemoved( const QString& type, const AppLnk& app )
 {
     LauncherView *view = tabs->view( type );
     if ( view )
         view->removeLink( app.linkFile() );
     else
         qWarning("removeAppLnk: No view for %s!", type.latin1() );
 }
 
 void Launcher::allApplicationsRemoved()
 {
     MimeType::clear();
     for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it)
         tabs->view( (*it) )->removeAllItems();
 }
@@ -739,40 +741,41 @@ void Launcher::applicationScanningProgress( int percent )
                 tabs->view( (*it) )->setUpdatesEnabled( FALSE );
                 tabs->view( (*it) )->setSortEnabled( FALSE );
             }
             break;
         }
         case 100: {
             for ( QStringList::ConstIterator it=ids.begin(); it!= ids.end(); ++it) {
                 tabs->view( (*it) )->setUpdatesEnabled( TRUE );
                 tabs->view( (*it) )->setSortEnabled( TRUE );
             }
             break;
         }
         default:
             break;
     }
 }
 
 void Launcher::documentScanningProgress( int percent )
 {
     switch ( percent ) {
         case 0: {
             tabs->setLoadingProgress( 0 );
             tabs->setLoadingWidgetEnabled( TRUE );
             tabs->docView()->setUpdatesEnabled( FALSE );
             tabs->docView()->setSortEnabled( FALSE );
             break;
         }
         case 100: {
             tabs->docView()->updateTools();
             tabs->docView()->setSortEnabled( TRUE );
             tabs->docView()->setUpdatesEnabled( TRUE );
             tabs->setLoadingWidgetEnabled( FALSE );
+            tb->refreshStartMenu();
             break;
         }
         default:
             tabs->setLoadingProgress( percent );
             break;
     }
 }