From 725771c472e074ba6df46fff4e8d3eaa6d7540d4 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Tue, 12 Jul 2016 12:12:39 +0200
Subject: [PATCH] QmlDesigner.PropertyEditor: Crash fix

Fixing infinite loop in java script.

Task-number: QTCREATORBUG-16573
Change-Id: I490d8b85635b7209f7923f9c8341bf77962c57b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../propertyEditorQmlSources/HelperWidgets/ComboBox.qml  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
index 85af3f1638b..849a7eb78aa 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
@@ -43,6 +43,8 @@ Controls.ComboBox {
 
     signal valueFromBackendChanged
 
+    property bool block: false
+
     ColorLogic {
         id: colorLogic
         backendValue: comboBox.backendValue
@@ -52,6 +54,11 @@ Controls.ComboBox {
 
         function invalidate() {
 
+            if (block)
+                return
+
+            block = true
+
             if (manualMapping) {
                 valueFromBackendChanged();
             } else if (!comboBox.useInteger) {
@@ -72,6 +79,8 @@ Controls.ComboBox {
                 if (comboBox.currentIndex !== backendValue.value)
                     comboBox.currentIndex = backendValue.value
             }
+
+            block = false
         }
     }