From 7fd870a0639fef0866889720b40775f4f916a307 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 25 Jun 2013 10:58:33 +0200
Subject: [PATCH] CComponentsForm: fix possible segfault

---
 src/gui/components/cc_frm.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/components/cc_frm.cpp b/src/gui/components/cc_frm.cpp
index 1cf9ff3ca..990a62223 100644
--- a/src/gui/components/cc_frm.cpp
+++ b/src/gui/components/cc_frm.cpp
@@ -195,10 +195,9 @@ void CComponentsForm::replaceCCItem(const uint& cc_item_id, CComponentsItem* new
 	if (!v_cc_items.empty()){
 		CComponentsItem* old_Item = v_cc_items[cc_item_id];
 		if (old_Item){
-			if (old_Item->getParent()){
-				new_cc_Item->setParent(old_Item);
-				new_cc_Item->setIndex(old_Item->getIndex());
-			}
+			CComponentsItem * old_parent = old_Item->getParent();
+			new_cc_Item->setParent(old_parent);
+			new_cc_Item->setIndex(old_parent->getIndex());
 			delete old_Item;
 			old_Item = NULL;
 			v_cc_items[cc_item_id] = new_cc_Item;