From 846a8bd9e99d0fa3c49f3f7408b6f7c94ca2ba7a Mon Sep 17 00:00:00 2001
From: Franz Schmid <Franz.Schmid@altmuehlnet.de>
Date: Sat, 23 May 2015 10:08:04 +0000
Subject: [PATCH] Fixed Bug #12820: Crash when deleting inline frame

git-svn-id: svn://scribus.net/trunk/Scribus@20120 11d20701-8431-0410-a711-e3c959e3b870
---
 scribus/scribus.cpp              | 1 +
 scribus/ui/propertiespalette.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scribus/scribus.cpp b/scribus/scribus.cpp
index 11cb81f066..45d3bbbf35 100644
--- a/scribus/scribus.cpp
+++ b/scribus/scribus.cpp
@@ -7483,6 +7483,7 @@ void ScribusMainWindow::editInlineEnd()
 	doc->currentEditedTextframe = NULL;
 	view->DrawNew();
 	pagePalette->Rebuild();
+	propertiesPalette->unsetItem();
 	propertiesPalette->updateColorList();
 	inlinePalette->editingFinished();
 	layerPalette->setEnabled(true);
diff --git a/scribus/ui/propertiespalette.cpp b/scribus/ui/propertiespalette.cpp
index 08c62febae..06b83c98e7 100644
--- a/scribus/ui/propertiespalette.cpp
+++ b/scribus/ui/propertiespalette.cpp
@@ -302,6 +302,7 @@ void PropertiesPalette::unsetItem()
 	Cpal->setCurrentItem(NULL);
 	Tpal->setCurrentItem(NULL);
 	tablePal->unsetItem();
+	groupPal->unsetItem();
 	handleSelectionChanged();
 }