Do not select items when navigating back/forward with the mouse

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index b1988ddc1e558290faa002025509ae6417ce8153..609e2ab92d69b61bc0cdb0b478fae9076b796521 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -22,7 +22,6 @@
 
 #include <dolphinapplication.h>
 #include <dolphinmainwindow.h>
-#include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
@@ -130,17 +129,17 @@ void DolphinSettingsDialog::applySettings()
         page->applySettings();
     }
 
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    emit settingsChanged();
+
+    GeneralSettings* settings = GeneralSettings::self();
     if (settings->modifiedStartupSettings()) {
         // Reset the modified startup settings hint. The changed startup settings
-        // have been applied already in app()->refreshMainWindows().
+        // have been applied already due to emitting settingsChanged().
         settings->setModifiedStartupSettings(false);
         settings->writeConfig();
     }
 
     enableButtonApply(false);
-
-    emit settingsChanged();
 }
 
 void DolphinSettingsDialog::restoreDefaults()