r17283 by fschmid - Fixed crash when closing the enhanced charselect palette.

[scribus-commit]

Author: fschmid
Date: Tue Feb  7 19:07:00 2012
New Revision: 17283

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17283
Log:
Fixed crash when closing the enhanced charselect palette.

Modified:
    branches/Version14x/Scribus/scribus/charselect.cpp

Modified: branches/Version14x/Scribus/scribus/charselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17283&path=/branches/Version14x/Scribus/scribus/charselect.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/charselect.cpp (original)
+++ branches/Version14x/Scribus/scribus/charselect.cpp Tue Feb  7 19:07:00 2012
@@ -187,9 +187,8 @@
 
 	QApplication::changeOverrideCursor(QCursor(Qt::WaitCursor));
 	m_enhanced = new CharSelectEnhanced(this);
-	connect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)),
-	        this, SLOT(slot_insertSpecialChars(const QString &)));
-	connect(m_enhanced, SIGNAL(paletteShown(bool)), hideButton, SLOT(setChecked(bool)));
+	connect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(slot_insertSpecialChars(const QString &)));
+//	connect(m_enhanced, SIGNAL(paletteShown(bool)), hideButton, SLOT(setChecked(bool)));
 	m_enhanced->setDoc(m_doc);
 	m_enhanced->setEnabled(this->isEnabled());
 	m_enhanced->show();
@@ -203,14 +202,13 @@
 
 	hideButton->blockSignals(true);
 	hideButton->setChecked(false);
-	hideButton->blockSignals(false);
-
-	disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)),
-	           this, SLOT(slot_insertSpecialChars(const QString &)));
-	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), hideButton, SLOT(setChecked(bool)));
+
+	disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)), this, SLOT(slot_insertSpecialChars(const QString &)));
+//	disconnect(m_enhanced, SIGNAL(paletteShown(bool)), hideButton, SLOT(setChecked(bool)));
 	m_enhanced->close();
 	delete m_enhanced;
 	m_enhanced = 0;
+	hideButton->blockSignals(false);
 }
 
 void CharSelect::hideButton_toggled(bool state)