From 65e9d9851027e2017aa248d0332bff53b1557c72 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 14 Feb 2019 23:47:07 +0100 Subject: [PATCH] don't fail the entire discovery if one of the scan targets fails --- networkdetector/discovery.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/networkdetector/discovery.cpp b/networkdetector/discovery.cpp index 760a68b8..3e86705b 100644 --- a/networkdetector/discovery.cpp +++ b/networkdetector/discovery.cpp @@ -65,10 +65,10 @@ void Discovery::discoveryFinished(int exitCode, QProcess::ExitStatus exitStatus) if (exitCode != 0 || exitStatus != QProcess::NormalExit) { qCWarning(dcNetworkDetector()) << "Nmap error failed. Is nmap installed correctly?"; - emit finished({}); m_discoveryProcesses.removeAll(discoveryProcess); discoveryProcess->deleteLater(); discoveryProcess = nullptr; + finishDiscovery(); return; } @@ -139,7 +139,7 @@ void Discovery::discoveryFinished(int exitCode, QProcess::ExitStatus exitStatus) if (foundHosts == 0 && m_discoveryProcesses.isEmpty()) { qCDebug(dcNetworkDetector()) << "Network scan successful but no hosts found in this network"; - emit finished({}); + finishDiscovery(); } }