Revert "Do not delete the clear action (and don't crash)"

elpaso · elpaso · commit 012ad1cb656e · 2018-10-23T08:51:02.000+02:00
This reverts commit 5c28693. Because regresses fb5caa7 See also Fixes #18537
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -37,7 +37,6 @@ QgsFilterLineEdit::QgsFilterLineEdit( QWidget *parent, const QString &nullValue
 
   connect( this, &QLineEdit::textChanged, this,
            &QgsFilterLineEdit::onTextChanged );
-
 }
 
 void QgsFilterLineEdit::setShowClearButton( bool visible )
@@ -72,8 +71,17 @@ void QgsFilterLineEdit::updateClearIcon()
     addAction( mClearAction, QLineEdit::TrailingPosition );
     connect( mClearAction, &QAction::triggered, this, &QgsFilterLineEdit::clearValue );
   }
-  if ( mClearAction )
-    mClearAction->setVisible( showClear );
+  else if ( !showClear && mClearAction )
+  {
+    // pretty freakin weird... seems the deleteLater call on the mClearAction
+    // isn't sufficient to actually remove the action from the line edit, and
+    // a kind of "ghost" action gets left behind... resulting in duplicate
+    // clear actions appearing if later we re-create the action.
+    // in summary: don't remove this "removeAction" call!
+    removeAction( mClearAction );
+    mClearAction->deleteLater();
+    mClearAction = nullptr;
+  }
 }
 
 void QgsFilterLineEdit::focusInEvent( QFocusEvent *e )
