From 23d3517c08cd81896cdbb6d2b4d9ea4e1f19e1ef Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 31 Aug 2021 08:48:17 +0200
Subject: [PATCH] switch adblock off if it encounters fatal process error

---
 resources/desktop/com.github.rssguard.appdata.xml     | 2 +-
 src/librssguard/miscellaneous/application.cpp         | 2 ++
 src/librssguard/miscellaneous/iofactory.cpp           | 4 +++-
 src/librssguard/network-web/adblock/adblockdialog.cpp | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index a80df693d..17c628a00 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.0.0" date="2021-08-26"/>
+    <release version="4.0.0" date="2021-08-31"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp
index 5d4d17358..3d8495b67 100644
--- a/src/librssguard/miscellaneous/application.cpp
+++ b/src/librssguard/miscellaneous/application.cpp
@@ -599,6 +599,8 @@ void Application::onAdBlockFailure() {
                        [=]() {
     m_webFactory->adBlock()->showDialog();
   });
+
+  qApp->settings()->setValue(GROUP(AdBlock), AdBlock::AdBlockEnabled, false);
 }
 
 #endif
diff --git a/src/librssguard/miscellaneous/iofactory.cpp b/src/librssguard/miscellaneous/iofactory.cpp
index 554962b61..c00186b22 100644
--- a/src/librssguard/miscellaneous/iofactory.cpp
+++ b/src/librssguard/miscellaneous/iofactory.cpp
@@ -79,7 +79,9 @@ bool IOFactory::startProcessDetached(const QString& program, const QStringList&
   process.setArguments(arguments);
 
 #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
-  process.setNativeArguments(native_arguments);
+  if (!native_arguments.isEmpty()) {
+    process.setNativeArguments(native_arguments);
+  }
 #else
   if (arguments.isEmpty() && !native_arguments.isEmpty()) {
     process.setArguments({ native_arguments });
diff --git a/src/librssguard/network-web/adblock/adblockdialog.cpp b/src/librssguard/network-web/adblock/adblockdialog.cpp
index a41f63ad1..fa6c240b2 100644
--- a/src/librssguard/network-web/adblock/adblockdialog.cpp
+++ b/src/librssguard/network-web/adblock/adblockdialog.cpp
@@ -110,7 +110,6 @@ void AdBlockDialog::onAdBlockEnabledChanged(bool enabled) {
 
 void AdBlockDialog::onAdBlockProcessTerminated() {
   m_ui.m_cbEnable->setChecked(false);
-
   m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error,
                                   tr("There is error, check application log for more details and "
                                      "head to online documentation. Also make sure that Node.js is installed."),