summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/startmenu.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index f17c7f8..b84eed8 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -145,18 +145,20 @@ void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file )
145 } 145 }
146 146
147 if ( applnk->type() == "Separator" ) { // No tr 147 if ( applnk->type() == "Separator" ) { // No tr
148 menu->insertSeparator(); 148 menu->insertSeparator();
149 delete applnk; 149 delete applnk;
150 } else { 150 } else {
151 QPixmap test; 151 QPixmap test;
152 test.convertFromImage( 152 QImage img = Resource::loadImage( applnk->icon() );
153 Resource::loadImage( applnk->icon() ).smoothScale( 153 if(!img.isNull() )
154 AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 ); 154 test.convertFromImage(
155 155 img.smoothScale(
156 menu->insertItem( test, applnk->name(), 156 AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );
157
158 menu->insertItem( test, applnk->name(),
157 currentItem + APPLNK_ID_OFFSET ); 159 currentItem + APPLNK_ID_OFFSET );
158 appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk ); 160 appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk );
159 currentItem++; 161 currentItem++;
160 } 162 }
161 } 163 }
162 164