r20120 by fschmid - Fixed Bug #12820: Crash when deleting inline frame

[scribus-commit]

Author: fschmid
Date: Sat May 23 10:08:04 2015
New Revision: 20120

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

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

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20120&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat May 23 10:08:04 2015
@@ -7483,6 +7483,7 @@
 	doc->currentEditedTextframe = NULL;
 	view->DrawNew();
 	pagePalette->Rebuild();
+	propertiesPalette->unsetItem();
 	propertiesPalette->updateColorList();
 	inlinePalette->editingFinished();
 	layerPalette->setEnabled(true);

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20120&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sat May 23 10:08:04 2015
@@ -302,6 +302,7 @@
 	Cpal->setCurrentItem(NULL);
 	Tpal->setCurrentItem(NULL);
 	tablePal->unsetItem();
+	groupPal->unsetItem();
 	handleSelectionChanged();
 }