From 51f3b898dec671baf756138be5b4fec1bef9c112 Mon Sep 17 00:00:00 2001 From: Franz Schmid Date: Sun, 24 May 2015 07:31:49 +0000 Subject: [PATCH] Fixed Bug #12820: Crash when deleting inline frame, additional fix git-svn-id: svn://scribus.net/trunk/Scribus@20123 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/ui/propertiespalette.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scribus/ui/propertiespalette.cpp b/scribus/ui/propertiespalette.cpp index 06b83c98e7..6340e5464e 100644 --- a/scribus/ui/propertiespalette.cpp +++ b/scribus/ui/propertiespalette.cpp @@ -266,7 +266,7 @@ void PropertiesPalette::unsetDoc() m_doc=NULL; m_item = NULL; - xyzPal->unsetItem(); + imagePal->unsetItem(); xyzPal->unsetDoc(); shadowPal->unsetItem(); shadowPal->unsetDoc(); @@ -301,8 +301,14 @@ void PropertiesPalette::unsetItem() 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(); }