From 6df252a2b195ba8883f3bbc4d2e7064a8f0074c6 Mon Sep 17 00:00:00 2001
From: Blottiere Paul <blottiere.paul@gmail.com>
Date: Mon, 22 Oct 2018 23:36:01 +0200
Subject: [PATCH] Do not draw a rubber band and hilight feature if not
 necessary

---
 src/app/qgsmaptoolchangelabelproperties.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp
index c882c6f80185..e1911fe81792 100644
--- a/src/app/qgsmaptoolchangelabelproperties.cpp
+++ b/src/app/qgsmaptoolchangelabelproperties.cpp
@@ -71,6 +71,12 @@ void QgsMapToolChangeLabelProperties::canvasPressEvent( QgsMapMouseEvent *e )
     QgsPalIndexes indexes;
     bool newAuxiliaryLayer = createAuxiliaryFields( indexes );
 
+    if ( !newAuxiliaryLayer && !mCurrentLabel.layer->auxiliaryLayer() )
+    {
+      deleteRubberBands();
+      return;
+    }
+
     // in case of a new auxiliary layer, a dialog window is displayed and the
     // canvas release event is lost.
     if ( newAuxiliaryLayer )