diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-10-15 20:16:12 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-10-15 18:20:02 +0000 |
| commit | 4cb4bcec0f42022cefe2b4b4e28f954aff618259 (patch) | |
| tree | f3104a59cac22fd9d19bb4d0e04c7c0f332db30e /src | |
| parent | 5edac46edbb220e575f5d9d35f1ba4ea427fc1e9 (diff) | |
QmlDesigner: Fix recent regression
After calling differenceHandler.typeDiffers() the modeNode
can be invalid. We have to account for this.
Task-number: QDS-2954
Change-Id: I76e28dcd3f1a824802e60bf47b773f5b8cb3d15a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 358720f5e7..708d120ba5 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -1119,6 +1119,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, differenceHandler.typeDiffers(isRootNode, modelNode, typeName, majorVersion, minorVersion, astNode, context); + + if (!modelNode.isValid()) + return; + if (!isRootNode && modelNode.majorVersion() != -1 && modelNode.minorVersion() != -1) { qWarning() << "Preempting Node sync. Type differs" << modelNode << modelNode.majorVersion() << modelNode.minorVersion(); |