From 4e6c6d06000005e0d91086d9d89f3253d9fd827e Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 21 May 2021 11:00:15 +0200 Subject: [PATCH] load filters in adblock dialog even when disabled + other minor fix --- src/librssguard/network-web/adblock/adblockdialog.cpp | 3 ++- src/librssguard/network-web/adblock/adblockmanager.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/librssguard/network-web/adblock/adblockdialog.cpp b/src/librssguard/network-web/adblock/adblockdialog.cpp index 84ae1bfa6..cf92067fe 100644 --- a/src/librssguard/network-web/adblock/adblockdialog.cpp +++ b/src/librssguard/network-web/adblock/adblockdialog.cpp @@ -89,7 +89,8 @@ void AdBlockDialog::testConfiguration() { << QUOTE_W_SPACE_DOT(ex.message()); m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Error, tr("There is error, check application log for more details and " - "head to online documentation.\n\nError: %1").arg(ex.message()), + "head to online documentation. Also make sure that Node.js is installed." + "\n\nError: %1").arg(ex.message()), tr("ERROR!")); } diff --git a/src/librssguard/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp index 65b5038e6..e6d6fc8d6 100644 --- a/src/librssguard/network-web/adblock/adblockmanager.cpp +++ b/src/librssguard/network-web/adblock/adblockmanager.cpp @@ -316,7 +316,9 @@ QProcess* AdBlockManager::restartServer(int port) { proc->setProcessEnvironment(pe); proc->setProcessChannelMode(QProcess::ProcessChannelMode::ForwardedErrorChannel); - if (!proc->open() || proc->state() == QProcess::ProcessState::NotRunning) { + if (!proc->open() || + proc->state() == QProcess::ProcessState::NotRunning || + proc->error() != QProcess::ProcessError::UnknownError) { auto ers = proc->errorString(); proc->deleteLater();