From bee12917270c5d286ff0915c727381eb08e9e017 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Sat, 4 Jan 2014 21:31:13 +1100
Subject: [PATCH] Fix bad tests in composerview (fix #9285)

---
 src/gui/qgscomposerview.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
index 26ce61b15d12..72cfec493589 100644
--- a/src/gui/qgscomposerview.cpp
+++ b/src/gui/qgscomposerview.cpp
@@ -390,7 +390,7 @@ void QgsComposerView::addShape( Tool currentTool )
   else if ( currentTool == AddTriangle )
     shape = QgsComposerShape::Triangle;
 
-  if ( !mRubberBandItem || mRubberBandItem->rect().width() < 0.1 || mRubberBandItem->rect().width() < 0.1 )
+  if ( !mRubberBandItem || ( mRubberBandItem->rect().width() < 0.1 && mRubberBandItem->rect().height() < 0.1 ) )
   {
     removeRubberBand();
     return;
@@ -691,7 +691,7 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
       break;
 
     case AddMap:
-      if ( !mRubberBandItem || mRubberBandItem->rect().width() < 0.1 || mRubberBandItem->rect().width() < 0.1 )
+      if ( !mRubberBandItem || ( mRubberBandItem->rect().width() < 0.1 && mRubberBandItem->rect().height() < 0.1 ) )
       {
         removeRubberBand();
         return;