diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index 4d764ee1c..6c7898deb 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -1202,6 +1202,8 @@ QString Conductor::text() const { * @return label with variables assigned */ QString Conductor::assignVariables(QString label) { + //The check below was introduced to avoid crash caused by the addition of terminal elements + //Needs further debbugging. if (diagram() == NULL) return label; //Titleblock Variables for (int i = 0; i < diagram()->border_and_titleblock.additionalFields().count(); i++) diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 170ef4930..6ae212d56 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -856,22 +856,24 @@ void Element::setFolioSequentialToHash(QStringList* list, QHash