fix for #380

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

1 files changed, 19 insertions, 1 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index d2e1836d7..cf65dc081 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -611,8 +611,20 @@ void KviOptionsDialog::applyClicked()
 void KviOptionsDialog::apply(bool bDialogAboutToClose)
 {
 	int count=m_pTreeWidget->topLevelItemCount();
+	int curTab=-1;
 	KviOptionsTreeWidgetItem * it;
 
+	if(!bDialogAboutToClose)
+	{
+		// bring up the current widget again!
+		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		//checking if the check of the check is checkable
+		if(it)
+			if(it->m_pOptionsWidget)
+				if(it->m_pOptionsWidget->tabWidget())
+					curTab = it->m_pOptionsWidget->tabWidget()->currentIndex();
+	}
+
 	for (int i=0;i<count;i++)
 	{
 		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
@@ -623,7 +635,13 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 	{
 		// bring up the current widget again!
 		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
-		if(it)treeWidgetItemSelectionChanged(it, 0);
+		if(it)
+		{
+			treeWidgetItemSelectionChanged(it, 0);
+			if(curTab > 0 && it->m_pOptionsWidget)
+				if(it->m_pOptionsWidget->tabWidget())
+					it->m_pOptionsWidget->tabWidget()->setCurrentIndex(curTab);
+		}
 	}
 
 	g_pApp->saveConfiguration();