From bf0f2ebea0029a82e37bb8085426330b55c6c31c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 11 Feb 2020 16:54:21 +0100 Subject: QmlDesigner: Fix assert If in a reaction to auxiliaryDataChanged() we change AuxiliaryData this could trigger cascades and to avoid this we assert. The cascades and assert can be avoided by checking AuxiliaryData before. Change-Id: Id9dd4198041889113fb0e50fdfd4785fddf89f02 Reviewed-by: Mahmoud Badri --- src/plugins/qmldesigner/components/formeditor/formeditorview.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 8b4b0dc221..c6e0516e13 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -661,6 +661,9 @@ void FormEditorView::toggle3DViewEnabled(bool enabled) QTC_ASSERT(model(), return); QTC_ASSERT(rootModelNode().isValid(), return); + if (enabled == rootModelNode().hasAuxiliaryData("3d-view")) + return; + if (enabled) rootModelNode().setAuxiliaryData("3d-view", true); else -- cgit v1.2.1