Don't add trashSettingsPage to m_pages if null

Otherwise we might crash in applySettings() or restoreDefaults()
This commit is contained in:
Kai Uwe Broulik 2017-02-13 13:51:05 +01:00
parent f7770c60b1
commit 7fce8f0e9b

View file

@ -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");