From 7fce8f0e9b1e0bb2deb6e32fe88d5411b9be2834 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Mon, 13 Feb 2017 13:51:05 +0100
Subject: [PATCH] Don't add trashSettingsPage to m_pages if null

Otherwise we might crash in applySettings() or restoreDefaults()
---
 src/settings/dolphinsettingsdialog.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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