diff options
| author | Kai Uwe Broulik <[email protected]> | 2017-02-13 13:51:05 +0100 |
|---|---|---|
| committer | Kai Uwe Broulik <[email protected]> | 2017-02-13 13:51:05 +0100 |
| commit | 7fce8f0e9b1e0bb2deb6e32fe88d5411b9be2834 (patch) | |
| tree | 9a5ccfbade73ee481884ac53aa7e2fe724f25272 | |
| parent | f7770c60b17108fde8d4b15006a4e8347e85de7b (diff) | |
Don't add trashSettingsPage to m_pages if null
Otherwise we might crash in applySettings() or restoreDefaults()
| -rw-r--r-- | src/settings/dolphinsettingsdialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 5314c24ed..50fd41e4c 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -105,7 +105,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) : m_pages.append(viewSettingsPage); m_pages.append(navigationSettingsPage); m_pages.append(servicesSettingsPage); - m_pages.append(trashSettingsPage); + if (trashSettingsPage) { + m_pages.append(trashSettingsPage); + } m_pages.append(generalSettingsPage); const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); |
