From 28676a4abd481ce031c1ce0c4b8a650ace3d938c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 17 Jul 2015 08:22:01 +0200 Subject: [PATCH] Some more Adblock shit. --- resources/text/CHANGELOG | 11 +++++++++-- src/network-web/adblock/adblocksubscription.cpp | 16 +++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 7e359ca4e..1a2165e12 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,4 +1,4 @@ - + + +

2.5.0

Added: - + + Fixed: +

2.4.2

Fixed: diff --git a/src/network-web/adblock/adblocksubscription.cpp b/src/network-web/adblock/adblocksubscription.cpp index fb55e3ac8..ff1497e97 100755 --- a/src/network-web/adblock/adblocksubscription.cpp +++ b/src/network-web/adblock/adblocksubscription.cpp @@ -162,7 +162,12 @@ void AdBlockSubscription::subscriptionDownloaded() { } bool error = false; - const QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8(); + QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8(); + + if (response.startsWith(' ')) { + // Deal with " [Adblock". + response = response.remove(0, 1); + } if (downloader->lastOutputError() != QNetworkReply::NoError || !response.startsWith(QByteArray("[Adblock")) || @@ -208,12 +213,13 @@ bool AdBlockSubscription::saveDownloadedData(const QByteArray &data) { file.write(part2); file.flush(); file.close(); - return true; + } + else { + file.write(data); + file.flush(); + file.close(); } - file.write(data); - file.flush(); - file.close(); return true; }