From 1062d217f0ecf99a97c7358b362c649194097f21 Mon Sep 17 00:00:00 2001
From: plc-user <74435298+plc-user@users.noreply.github.com>
Date: Mon, 15 Jul 2024 00:01:20 +0200
Subject: [PATCH] move code into else-clause to avoid possible crashes

---
 sources/qetgraphicsitem/conductor.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp
index 94a7ac5ba..de042ea8e 100644
--- a/sources/qetgraphicsitem/conductor.cpp
+++ b/sources/qetgraphicsitem/conductor.cpp
@@ -1041,11 +1041,6 @@ QDomElement Conductor::toXml(QDomDocument &dom_document,
 	dom_element.setAttribute("x", QString::number(pos().x()));
 	dom_element.setAttribute("y", QString::number(pos().y()));
 	
-	if (terminal1->parentElement()->linkedElements().isEmpty()) {
-	} else {
-	dom_element.setAttribute("element1_linked", terminal1->parentElement()->linkedElements().last()->actualLabel());
-	}
-
 	// Terminal is uniquely identified by the uuid of the terminal and the element
 	if (terminal1->uuid().isNull()) {
 		// legacy method to identify the terminal
@@ -1053,23 +1048,27 @@ QDomElement Conductor::toXml(QDomDocument &dom_document,
 	} else {
 		dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
 		dom_element.setAttribute("element1_label", terminal1->parentElement()->actualLabel());
+		if (terminal1->parentElement()->linkedElements().isEmpty()) {
+			//
+		} else {
+			dom_element.setAttribute("element1_linked", terminal1->parentElement()->linkedElements().last()->actualLabel());
+		}
 		dom_element.setAttribute("element1_name", terminal1->parentElement()->name());
 		dom_element.setAttribute("terminal1", terminal1->uuid().toString());
 		dom_element.setAttribute("terminalname1", terminal1->name());
-		
 	}
 
-	if (terminal2->parentElement()->linkedElements().isEmpty()) {
-	} else {
-	dom_element.setAttribute("element2_linked", terminal2->parentElement()->linkedElements().last()->actualLabel());
-	}
-	
 	if (terminal2->uuid().isNull()) {
 		// legacy method to identify the terminal
 		dom_element.setAttribute("terminal2", table_adr_id.value(terminal2)); // for backward compatibility
 	} else {
 		dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
 		dom_element.setAttribute("element2_label", terminal2->parentElement()->actualLabel());
+		if (terminal2->parentElement()->linkedElements().isEmpty()) {
+			//
+		} else {
+			dom_element.setAttribute("element2_linked", terminal2->parentElement()->linkedElements().last()->actualLabel());
+		}
 		dom_element.setAttribute("element2_name", terminal2->parentElement()->name());
 		dom_element.setAttribute("terminal2", terminal2->uuid().toString());
 		dom_element.setAttribute("terminalname2", terminal2->name());