summaryrefslogtreecommitdiffabout
path: root/kaddressbook/imagewidget.cpp
Side-by-side diff
Diffstat (limited to 'kaddressbook/imagewidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/imagewidget.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 1e9743c..d0f52ea 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -238,10 +238,11 @@ KABC::Picture ImageWidget::logo() const
if ( px->height() > px->width() )
logo.setData( px->convertToImage().scaleHeight( 140 ) );
else
logo.setData( px->convertToImage().scaleWidth( 100 ) );
-#else //KAB_EMBEDDED
- logo.setData( px->convertToImage() );
+#else //KAB_EMBEDDED
+ if (px->isNull() != true )
+ logo.setData( px->convertToImage() );
#endif //KAB_EMBEDDED
logo.setType( "PNG" );