Stop trying to scale a null image

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
@@ -148,12 +148,14 @@ void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file )
                     menu->insertSeparator();

                 delete applnk;

                } else {

-                   QPixmap test;

-            test.convertFromImage(

-                Resource::loadImage( applnk->icon() ).smoothScale(

-                    AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

-

-                    menu->insertItem( test, applnk->name(),

+                QPixmap test;

+                QImage img = Resource::loadImage( applnk->icon() );

+                if(!img.isNull() )

+                    test.convertFromImage(

+                           img.smoothScale(

+                            AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

+

+                menu->insertItem( test, applnk->name(),

                               currentItem + APPLNK_ID_OFFSET );

             appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk );

             currentItem++;