don't try to reuse already opened option widgets (fixes #1018)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5143 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 13 insertions, 7 deletions

diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index f0d700b6b..deefa509e 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -191,7 +191,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 {
 
 	//qDebug("Instantiating");
-	// Create the global widget dict : case sensitive , do not copy keys
+	// Create the global widget dict : case sensitive, do not copy keys
 	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
@@ -350,18 +350,24 @@ void KviOptionsInstanceManager::widgetDestroyed()
 KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
 {
 	if(!e)return 0;
+	if(e->pWidget)
+	{
+		if(e->pWidget->parent() != par)
+		{
+			QWidget * oldPar = (QWidget *)e->pWidget->parent();
+			e->pWidget->setParent(par);
+			oldPar->deleteLater();
+			e->pWidget=0;
+		}
+	}
+
 	if(!(e->pWidget))
 	{
 		e->pWidget = e->createProc(par);
 		g_iOptionWidgetInstances++;
 		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 	}
-	if(e->pWidget->parent() != par)
-	{
-		QWidget * oldPar = (QWidget *)e->pWidget->parent();
-		e->pWidget->setParent(par); //reparent(par,QPoint(0,0));
-		delete oldPar;
-	}
+
 	if(e->bIsContainer)
 	{
 		// need to create the container structure!