feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.PropertyEditor: Crash fix

Browse Source 
Fixing infinite loop in java script.

Task-number: QTCREATORBUG-16573
Change-Id: I490d8b85635b7209f7923f9c8341bf77962c57b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-07-12 12:12:39 +02:00
parent 2c22cd0e4c
commit 725771c472
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml
View File

@@ -43,6 +43,8 @@ Controls.ComboBox {
signal valueFromBackendChanged signal valueFromBackendChanged
property bool block: false
ColorLogic { ColorLogic {
id: colorLogic id: colorLogic
backendValue: comboBox.backendValue backendValue: comboBox.backendValue
@@ -52,6 +54,11 @@ Controls.ComboBox {
function invalidate() { function invalidate() {
if (block)
return
block = true
if (manualMapping) { if (manualMapping) {
valueFromBackendChanged(); valueFromBackendChanged();
} else if (!comboBox.useInteger) { } else if (!comboBox.useInteger) {
@@ -72,6 +79,8 @@ Controls.ComboBox {
if (comboBox.currentIndex !== backendValue.value) if (comboBox.currentIndex !== backendValue.value)
comboBox.currentIndex = backendValue.value comboBox.currentIndex = backendValue.value
} }
block = false
} }
} }