- removed code which let qpe crash when generating image icons

- when edit properties of an document item it will reread the table of categories

1 files changed, 10 insertions, 8 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 010a2e9..5ec1cf8 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -354,18 +354,18 @@ void LauncherTabWidget::setProgressStyle()
 void LauncherTabWidget::setBusy(bool on)
 {
     if ( on )
     currentView()->setBusy(TRUE);
     else {
     for ( int i = 0; i < categoryBar->count(); i++ ) {
-        if (categoryBar->tab(i)) {
-            LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
-            view->setBusy( FALSE );
-        } else {
-            odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl;
-        }
+    if (categoryBar->tab(i)) {
+        LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
+        view->setBusy( FALSE );
+    } else {
+        odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl;
+    }
     }
     }
 }
 
 void LauncherTabWidget::setBusyIndicatorType( const QString& str ) {
     for (int i = 0; i < categoryBar->count(); i++ ) {
@@ -598,15 +598,17 @@ void Launcher::select( const AppLnk *appLnk )
 void Launcher::properties( AppLnk *appLnk )
 {
     if ( appLnk->type() == "Folder" ) { // No tr
     // Not supported: flat is simpler for the user
     } else {
 /* ### libqtopia FIXME also moving docLnks... */
-    LnkProperties prop(appLnk,0 );
+        LnkProperties prop(appLnk,0 );
 
-    QPEApplication::execDialog( &prop );
+        if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) {
+            tabs->docView()->updateTools();
+        }
     }
 }
 
 void Launcher::storageChanged( const QList<FileSystem> & )
 {
     // ### update combo boxes if we had a combo box for the storage type