| author | zecke <zecke> | 2004-02-05 15:57:13 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-02-05 15:57:13 (UTC) |
| commit | 823399a552c04821fb0b49d816d733fa21a12a21 (patch) (unidiff) | |
| 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 | |||
| @@ -149,10 +149,12 @@ void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file ) | |||
| 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 ); |