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

[scribus-commit]

Author: fschmid
Date: Sun May 24 07:31:49 2015
New Revision: 20123

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

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

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20123&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sun May 24 07:31:49 2015
@@ -266,7 +266,7 @@
 	m_doc=NULL;
 	m_item = NULL;
 
-	xyzPal->unsetItem();
+	imagePal->unsetItem();
 	xyzPal->unsetDoc();
 	shadowPal->unsetItem();
 	shadowPal->unsetDoc();
@@ -301,8 +301,14 @@
 	m_item     = NULL;
 	Cpal->setCurrentItem(NULL);
 	Tpal->setCurrentItem(NULL);
+	imagePal->unsetItem();
 	tablePal->unsetItem();
+	shapePal->unsetItem();
 	groupPal->unsetItem();
+	textPal->unsetItem();
+	shadowPal->unsetItem();
+	imagePal->unsetItem();
+	linePal->unsetItem();
 	handleSelectionChanged();
 }