From 5bc0d5b4e3ccc343d37ebc420cec9c02242ffd3d Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Mon, 21 Jan 2008 17:48:56 +0000 Subject: [PATCH] - Don't draw on null pixmaps svn path=/trunk/KDE/kdepim/; revision=764405 --- headeritem.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/headeritem.cpp b/headeritem.cpp index 7d762c8c4..06b121d5b 100644 --- a/headeritem.cpp +++ b/headeritem.cpp @@ -322,9 +322,13 @@ const QPixmap *HeaderItem::pixmap(int col) const if ( !headers->mPaintInfo.showTodo ) if ( status.isTodo() ) pixmaps << *KMHeaders::pixTodo; - static QPixmap mergedpix; - mergedpix = pixmapMerge( pixmaps ); - return &mergedpix; + if ( !pixmaps.isEmpty() ) { + static QPixmap mergedpix; + mergedpix = pixmapMerge( pixmaps ); + return &mergedpix; + } + else + return 0; } else if ( col == headers->paintInfo()->statusCol ) { return statusIcon(msgBase);