diff options
| author | Simon Rettberg | 2020-10-27 13:23:01 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-10-27 13:23:01 +0100 |
| commit | 43965eb877ed24d94b8cfa09f948b7877bcffc24 (patch) | |
| tree | 3796e1a3d59b5df91007df6ab11b84405e5ef705 /src/slxbrowser.cpp | |
| parent | Fix triggering "go back" on blocked URL (diff) | |
| download | slxbrowser-43965eb877ed24d94b8cfa09f948b7877bcffc24.tar.gz slxbrowser-43965eb877ed24d94b8cfa09f948b7877bcffc24.tar.xz slxbrowser-43965eb877ed24d94b8cfa09f948b7877bcffc24.zip | |
Allow blacklist and whitelist at the same time.
Whitelist takes precedence.
Diffstat (limited to 'src/slxbrowser.cpp')
| -rw-r--r-- | src/slxbrowser.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/slxbrowser.cpp b/src/slxbrowser.cpp index c4c2067..8cc8749 100644 --- a/src/slxbrowser.cpp +++ b/src/slxbrowser.cpp @@ -51,14 +51,15 @@ SlxBrowser::SlxBrowser(BrowserSettings settings) // QWebPage *page = _browser->page(); QNetworkAccessManager *nam; - if (_settings.urlList.isEmpty()) { + if (_settings.whiteList.isEmpty() && _settings.blackList.isEmpty()) { nam = new QNetworkAccessManager(this); } else { - if (_settings.isWhitelist) { - // Just to be safe - _settings.urlList << _settings.url; + if (_settings.blackList.isEmpty()) { + _settings.blackList << "*"; } - nam = new SlxNetworkAccessManager(urlListToRegExp(_settings.urlList), _settings.isWhitelist); + // Just to be safe + _settings.whiteList << _settings.url; + nam = new SlxNetworkAccessManager(urlListToRegExp(_settings.blackList), urlListToRegExp(_settings.whiteList)); } connect(nam, &QNetworkAccessManager::sslErrors, this, &SlxBrowser::sslErrors); connect(nam, &QNetworkAccessManager::finished, this, &SlxBrowser::requestFinished); |