From 43965eb877ed24d94b8cfa09f948b7877bcffc24 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Oct 2020 13:23:01 +0100
Subject: Allow blacklist and whitelist at the same time.

Whitelist takes precedence.
---
 src/slxbrowser.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/slxbrowser.cpp')

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);
-- 
cgit v1.2.3-55-g7522