[Pkg-owncloud-commits] [owncloud-client] 10/121: Folder: fix removing folder with escaped characters (#4943)
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Jul 28 15:31:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit b99c8fe28b8586cff5bed1297c501dbea60a7c81
Author: Olivier Goffart <olivier at woboq.com>
Date: Fri Jun 3 13:10:01 2016 +0200
Folder: fix removing folder with escaped characters (#4943)
FolderDefinition::save and load escapes the alias. We also need to escape
it when we remove it.
New folder can't be created with alias that needs escaping, but old folder
from old config may still exist, and we must allow user to delete them.
---
src/gui/folder.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 518859f..0a88c68 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -631,7 +631,7 @@ void Folder::removeFromSettings() const
{
auto settings = _accountState->settings();
settings->beginGroup(QLatin1String("Folders"));
- settings->remove(_definition.alias);
+ settings->remove(FolderMan::escapeAlias(_definition.alias));
}
bool Folder::isFileExcludedAbsolute(const QString& fullPath) const
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list