Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 16:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1355 from yan12125/browser-improve-proxy-path-handling

Browse Source 
Improve proxy path handling for the browser plugin
This commit is contained in:
Janek Bevendorff 2018-01-06 12:52:39 +01:00 committed by GitHub
commit 5fe18400c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/browser/BrowserSettings.cpp
View File

@ -156,7 +156,10 @@ void BrowserSettings::setUseCustomProxy(bool enabled)
QString BrowserSettings::customProxyLocation()
{
return config()->get("Browser/CustomProxyLocation", " ").toString();
if (!useCustomProxy()) {
return QString();
}
return config()->get("Browser/CustomProxyLocation", "").toString();
}
void BrowserSettings::setCustomProxyLocation(QString location)