diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2010-11-15 11:44:21 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2010-11-15 12:12:09 +0100 |
| commit | 5aedcb78a8d40901ba81c3e14652d0c48d1efca0 (patch) | |
| tree | 573d16a6dc7309784a52606dbb7e47a74e4942f1 /src/plugins/help | |
| parent | e35c53e7f8cfae60eee280cce85c12e708e1ed20 (diff) | |
| download | qt-creator-5aedcb78a8d40901ba81c3e14652d0c48d1efca0.tar.gz | |
Help plugin: Fix possible crash on documentation update.
We must not call updateFilterPage() when the "Options" dialog
is not currently open.
Without this patch, Creator will crash on a documentation update
if that dialog has been opened at least once and is currently closed.
Reviewed-by: kh1
Reviewed-by: con
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/filtersettingspage.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/help/filtersettingspage.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index faf02d941c..f114b6f99d 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -247,6 +247,12 @@ void FilterSettingsPage::apply() } } +void FilterSettingsPage::finish() +{ + disconnect(Core::HelpManager::instance(), SIGNAL(documentationChanged()), + this, SLOT(updateFilterPage())); +} + bool FilterSettingsPage::matches(const QString &s) const { return m_searchKeywords.contains(s, Qt::CaseInsensitive); diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 1af5549e31..0968b1d3db 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -52,7 +52,7 @@ public: QWidget *createPage(QWidget *parent); void apply(); - void finish() {} + void finish(); virtual bool matches(const QString &s) const; signals: |