From: Kevin Funk Date: Tue, 21 Nov 2017 10:00:07 +0000 (+0100) Subject: Revert some hunks from previous commit X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f024c3c01f1d80cb5972cca8043188daacce72e5 Revert some hunks from previous commit Changes in folderspanel.cpp in 464b13f3828e5cdd03438d0881c3a62c7cda6333 were unintended. --- diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp index 6659c7c91..eef27ce47 100644 --- a/src/panels/folders/folderspanel.cpp +++ b/src/panels/folders/folderspanel.cpp @@ -91,7 +91,7 @@ void FoldersPanel::setLimitFoldersPanelToHome(bool enable) bool FoldersPanel::limitFoldersPanelToHome() const { - return limitFoldersPanelToHome(); + return FoldersPanelSettings::limitFoldersPanelToHome(); } void FoldersPanel::setAutoScrolling(bool enable) @@ -325,7 +325,7 @@ void FoldersPanel::loadTree(const QUrl& url) QUrl baseUrl; if (url.isLocalFile()) { const bool isInHomeFolder = Dolphin::homeUrl().isParentOf(url) || (Dolphin::homeUrl() == url); - if (limitFoldersPanelToHome() && isInHomeFolder) { + if (FoldersPanelSettings::limitFoldersPanelToHome() && isInHomeFolder) { baseUrl = Dolphin::homeUrl(); } else { // Use the root directory as base for local URLs (#150941)