Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: I488a1ee13117760781019a2f4bc6f6dff64c6871

1 files changed, 5 insertions, 1 deletions

diff --git a/Source/WebKit/qt/WidgetSupport/QtWebComboBox.cpp b/Source/WebKit/qt/WidgetSupport/QtWebComboBox.cpp
index 4cfa366dc..b47af40e0 100644
--- a/Source/WebKit/qt/WidgetSupport/QtWebComboBox.cpp
+++ b/Source/WebKit/qt/WidgetSupport/QtWebComboBox.cpp
@@ -55,12 +55,16 @@ bool QtWebComboBox::eventFilter(QObject* watched, QEvent* event)
 
 void QtWebComboBox::hidePopup()
 {
+    if (m_hiding)
+        return;
     m_hiding = true;
     // QComboBox::hidePopup() runs an eventloop, we need to make sure we do not delete ourselves in that loop.
     QComboBox::hidePopup();
     m_hiding = false;
-    if (m_deleteAfterHiding)
+    if (m_deleteAfterHiding) {
         deleteLater();
+        m_deleteAfterHiding = false;
+    }
 }