From 0f22bf4774240da303f7c18fb4566823e3743d4b Mon Sep 17 00:00:00 2001
From: dfochi
 <dfochi@r4701  dfochi  2016-09-12 19:11:06 +0200 (lun. 12 sept. 2016)>
Date: Sun, 4 Sep 2016 18:14:26 +0000
Subject: [PATCH] Fix Undo(Ctrl+Z) crash related with conductor frozen label.
 Prevent freezing blank label in conductor

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4686 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/qetgraphicsitem/conductor.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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;
 }