r20131 by jghali - fix issue with signal disconnection in text color widget

scribus-commit scribus-commit at lists.scribus.net
Sun May 24 16:57:03 UTC 2015


Author: jghali
Date: Sun May 24 16:57:03 2015
New Revision: 20131

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20131
Log:
fix issue with signal disconnection in text color widget

Modified:
    trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp

Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20131&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp Sun May 24 16:57:03 2015
@@ -90,18 +90,17 @@
 	//if (m_item == i)
 	//	return;
 
+	disconnectSignals();
+
 	m_item = item;
 	if (item && m_doc.isNull())
 		setDoc(item->doc());
-	if (item == NULL)
-		return;
-	if (!item->isTable() && !item->isTextFrame())
-		return;
-
-	disconnectSignals();
+
 	configureWidgets();
 
-	if (!m_item)
+	if (m_item == NULL)
+		return;
+	if (!m_item->isTable() && !m_item->isTextFrame())
 		return;
 
 	PageItem_TextFrame *i2;




More information about the scribus-commit mailing list