diff options
| author | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-07 19:07:00 +0000 |
|---|---|---|
| committer | fschmid <fschmid@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-07 19:07:00 +0000 |
| commit | e0bd74929381710c3ecb2ba3fe3b9d54f914e88b (patch) | |
| tree | 1841a4da41738f852d53c4202bb46bbc520404c6 /scribus/charselect.cpp | |
| parent | cef71e4c898544c2fc8a359ce7d50fee155acbbe (diff) | |
| download | scribus-e0bd74929381710c3ecb2ba3fe3b9d54f914e88b.tar.gz scribus-e0bd74929381710c3ecb2ba3fe3b9d54f914e88b.tar.xz scribus-e0bd74929381710c3ecb2ba3fe3b9d54f914e88b.zip | |
Fixed crash when closing the enhanced charselect palette.
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17283 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/charselect.cpp')
| -rw-r--r-- | scribus/charselect.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scribus/charselect.cpp b/scribus/charselect.cpp index 19e9355..d0e386d 100644 --- a/scribus/charselect.cpp +++ b/scribus/charselect.cpp @@ -187,9 +187,8 @@ void CharSelect::openEnhanced() 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 @@ void CharSelect::closeEnhanced() 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) |