From 3c74c03c59c4a39156a540812c53a62708c87d83 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 29 Dec 2019 13:49:57 +0200 Subject: [PATCH] Fix crash after uniting three pieces in sequence. (grafted from 7f649df048328d449e1de01794d238eeef0c39be) --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vtools/tools/vtooluniondetails.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index d45a7a8ae..883646946 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -72,6 +72,7 @@ - [#978] Don't show errors in History dialog. - Fixed translation numbers in scientific notation. - Fix dialog for tool Point along perpendicular. No memory of line color settings. +- Fix crash after uniting three pieces in sequence. # Version 0.6.1 October 23, 2018 - [#885] Regression. Broken support for multi size measurements. diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 13c5b753c..a1a12424c 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -412,6 +412,7 @@ quint32 AddNodePoint(const VPieceNode &node, const VToolUnionDetailsInitData &in const quint32 idObject = initData.data->AddGObject(point.take()); children.append(idObject); + point1->setIdObject(idObject); point1->setMode(Draw::Modeling); const quint32 id = initData.data->AddGObject(point1.take()); @@ -539,6 +540,7 @@ quint32 AddNodeArc(const VPieceNode &node, const VToolUnionDetailsInitData &init const quint32 idObject = initData.data->AddGObject(arc1.take()); children.append(idObject); + arc2->setIdObject(idObject); arc2->setMode(Draw::Modeling); const quint32 id = initData.data->AddGObject(arc2.take()); @@ -592,6 +594,7 @@ quint32 AddNodeElArc(const VPieceNode &node, const VToolUnionDetailsInitData &in const quint32 idObject = initData.data->AddGObject(arc1.take()); children.append(idObject); + arc2->setIdObject(idObject); arc2->setMode(Draw::Modeling); const quint32 id = initData.data->AddGObject(arc2.take()); @@ -637,6 +640,7 @@ quint32 AddNodeSpline(const VPieceNode &node, const VToolUnionDetailsInitData &i children.append(idObject); VSpline *spl1 = new VSpline(*spl); + spl1->setIdObject(idObject); spl1->setMode(Draw::Modeling); const quint32 id = initData.data->AddGObject(spl1); @@ -710,6 +714,7 @@ quint32 AddNodeSplinePath(const VPieceNode &node, const VToolUnionDetailsInitDat const quint32 idObject = initData.data->AddGObject(path.take()); children.append(idObject); + path1->setIdObject(idObject); path1->setMode(Draw::Modeling); const quint32 id = initData.data->AddGObject(path1.take());