diff --git a/src/libs/vtools/undocommands/savepieceoptions.cpp b/src/libs/vtools/undocommands/savepieceoptions.cpp index 4a1e78c99..f96e27752 100644 --- a/src/libs/vtools/undocommands/savepieceoptions.cpp +++ b/src/libs/vtools/undocommands/savepieceoptions.cpp @@ -172,7 +172,10 @@ bool SavePieceOptions::mergeWith(const QUndoCommand *command) const QVector nodes = m_newDet.GetPath().GetNodes(); const QVector candidateNodes = candidate.GetPath().GetNodes(); - SCASSERT(nodes.size() == candidateNodes.size()) + if (nodes.size() != candidateNodes.size()) + { + return false; + } for (int i = 0; i < nodes.size(); ++i) { diff --git a/src/libs/vtools/undocommands/savepiecepathoptions.cpp b/src/libs/vtools/undocommands/savepiecepathoptions.cpp index 9c2fc6df1..de55b19a5 100644 --- a/src/libs/vtools/undocommands/savepiecepathoptions.cpp +++ b/src/libs/vtools/undocommands/savepiecepathoptions.cpp @@ -143,7 +143,10 @@ bool SavePiecePathOptions::mergeWith(const QUndoCommand *command) const QVector nodes = m_newPath.GetNodes(); const QVector candidateNodes = candidate.GetNodes(); - SCASSERT(nodes.size() == candidateNodes.size()) + if (nodes.size() == candidateNodes.size()) + { + return false; + } for (int i = 0; i < nodes.size(); ++i) {