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

ModelEditor: Fix a crash moving packages into itself

Browse Source 
Change-Id: I1a722b9514ee0a57d8bd8be2f4ea05ed87c6686d
Task-number: QTCREATORBUG-18262
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2017-07-25 22:35:42 +02:00
parent 336f54def4
commit 4b3acf03fb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/modelinglib/qmt/model_controller/modelcontroller.cpp
View File

@@ -756,6 +756,13 @@ void ModelController::moveObject(MPackage *newOwner, MObject *object)
QMT_CHECK(object);
QMT_CHECK(object != m_rootPackage);
// verify that newOwner is not a child of object
MObject *newOwnerObject = newOwner;
while (newOwnerObject && newOwnerObject != object)
newOwnerObject = newOwnerObject->owner();
if (newOwnerObject == object)
return;
if (newOwner != object->owner()) {
int formerRow = 0;
MObject *formerOwner = object->owner();