diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index c78eb6350..76a1ee102 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -1471,10 +1471,13 @@ void Conductor::setProperties(const ConductorProperties &properties) } setText(properties_.text); text_item -> setFontSize(properties_.text_size); - if (terminal1->diagram()->item_paste) - m_frozen_label = ""; - else - m_frozen_label = properties_.text; + + if (terminal1 != NULL && terminal1->diagram() != NULL) { + if (terminal1->diagram()->item_paste) + m_frozen_label = ""; + else + m_frozen_label = properties_.text; + } if (freeze_label) freezeLabel(); if (properties_.type != ConductorProperties::Multi) @@ -1896,5 +1899,6 @@ void Conductor::freezeLabel() { */ void Conductor::unfreezeLabel() { this->setText(m_frozen_label); + if (m_frozen_label == "") return; properties_.text = m_frozen_label; }