Some checks for null pixmaps (qtmail seems to create a scrollbar with

width and height == -1 when you tap "New mailbox")

1 files changed, 4 insertions, 2 deletions

diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp
index 2071a67..90b45fe 100644
--- a/noncore/styles/theme/ogfxeffect.cpp
+++ b/noncore/styles/theme/ogfxeffect.cpp
@@ -27,9 +27,10 @@
 QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
 	const QColor &cb, GradientType eff, int ncols)
 {
+	if ( !pixmap. isNull ( )) {
 	QImage image = gradient(pixmap.size(), ca, cb, eff, ncols);
 	pixmap.convertFromImage(image);
-
+	}
 	return pixmap;
 }
 
@@ -280,6 +281,7 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
 			  const QColor &bgnd, GradientType eff,
 			  bool anti_dir, int /*ncols*/)
 {
+	if ( !pixmap. isNull ( )) {
     QImage image = pixmap.convertToImage();
     OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir);
 
@@ -287,7 +289,7 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
 		image. convertDepth ( pixmap. depth ( ));
 
     pixmap.convertFromImage(image);
-
+	}	
     return pixmap;
 }