| author | zecke <zecke> | 2004-02-05 15:57:13 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-02-05 15:57:13 (UTC) |
| commit | 823399a552c04821fb0b49d816d733fa21a12a21 (patch) (side-by-side diff) | |
| tree | a5683ede5436c6b912a89d4ccc6cd63953214ea4 | |
| parent | 8cb0ae68f155c989cb9533c1f04d04ec64083708 (diff) | |
| download | opie-823399a552c04821fb0b49d816d733fa21a12a21.zip opie-823399a552c04821fb0b49d816d733fa21a12a21.tar.gz opie-823399a552c04821fb0b49d816d733fa21a12a21.tar.bz2 | |
Stop trying to scale a null image
| -rw-r--r-- | core/launcher/startmenu.cpp | 14 |
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 @@ -139,30 +139,32 @@ void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file ) {
if ( file.right(8) == ".desktop" ) {
AppLnk* applnk = new AppLnk( dir.path() + "/" + file );
if ( !applnk->isValid() ) {
delete applnk;
return;
}
if ( applnk->type() == "Separator" ) { // No tr
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++;
}
}
}
void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot )
{
// do some sanity checks and collect information
|