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

QmlDesigner: Fix recent regression

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2020-10-15 20:16:12 +02:00
parent 5edac46edb
commit 4cb4bcec0f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1119,6 +1119,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
differenceHandler.typeDiffers(isRootNode, modelNode, typeName, differenceHandler.typeDiffers(isRootNode, modelNode, typeName,
majorVersion, minorVersion, majorVersion, minorVersion,
astNode, context); astNode, context);
if (!modelNode.isValid())
return;
if (!isRootNode && modelNode.majorVersion() != -1 && modelNode.minorVersion() != -1) { if (!isRootNode && modelNode.majorVersion() != -1 && modelNode.minorVersion() != -1) {
qWarning() << "Preempting Node sync. Type differs" << modelNode << qWarning() << "Preempting Node sync. Type differs" << modelNode <<
modelNode.majorVersion() << modelNode.minorVersion(); modelNode.majorVersion() << modelNode.minorVersion();