From 5b7d39a72a870cd2a8abf966ea243a6f0058d748 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 1 Oct 2014 20:31:37 +1000
Subject: [PATCH] Fix more warnings for QgsColorButtonV2 with invalid size

---
 src/gui/qgscolorbuttonv2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/qgscolorbuttonv2.cpp b/src/gui/qgscolorbuttonv2.cpp
index f940af9b168..ef6fa5b628e 100644
--- a/src/gui/qgscolorbuttonv2.cpp
+++ b/src/gui/qgscolorbuttonv2.cpp
@@ -571,7 +571,7 @@ void QgsColorButtonV2::setButtonBackground( const QColor color )
 #endif
   }
 
-  if ( !currentIconSize.isValid() )
+  if ( !currentIconSize.isValid() || currentIconSize.width() <= 0 || currentIconSize.height() <= 0 )
   {
     return;
   }