r20124 by fschmid - Fixed Bug #12820: Crash when deleting inline frame, additional fix

[scribus-commit]

Author: fschmid
Date: Sun May 24 07:48:32 2015
New Revision: 20124

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20124
Log:
Fixed Bug #12820: Crash when deleting inline frame, additional fix

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

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20124&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Sun May 24 07:48:32 2015
@@ -206,6 +206,7 @@
 {
 	m_haveItem = false;
 	m_item     = NULL;
+	colorWidgets->setCurrentItem(m_item);
 	handleSelectionChanged();
 }
 

Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20124&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 07:48:32 2015
@@ -90,6 +90,7 @@
 	//if (m_item == i)
 	//	return;
 
+	m_item = item;
 	if (item && m_doc.isNull())
 		setDoc(item->doc());
 	if (item == NULL)
@@ -97,7 +98,6 @@
 	if (!item->isTable() && !item->isTextFrame())
 		return;
 
-	m_item = item;
 	disconnectSignals();
 	configureWidgets();
 

Modified: trunk/Scribus/scribus/ui/propertywidget_textcolor.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20124&path=/trunk/Scribus/scribus/ui/propertywidget_textcolor.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_textcolor.h (original)
+++ trunk/Scribus/scribus/ui/propertywidget_textcolor.h Sun May 24 07:48:32 2015
@@ -24,6 +24,7 @@
 	~PropertyWidget_TextColor() {};
 
 	void updateColorList();
+	void setCurrentItem(PageItem *i);
 
 protected:
 	PageItem *         m_item;
@@ -33,7 +34,6 @@
 	void disconnectSignals();
 
 	void configureWidgets(void);
-	void setCurrentItem(PageItem *i);
 
 	virtual void changeEvent(QEvent *e);