ETM-Schurig/nymea-plugins
1
0
Fork 0
mirror of https://github.com/nymea/nymea-plugins.git synced 2026-08-04 03:23:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #87: NetworkDetector: Don't fail the entire discovery if one of the scan targets fails

Browse Source
This commit is contained in:
Jenkins 2019-03-06 21:13:45 +01:00
commit eac8a461cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
networkdetector/discovery.cpp
View File

@ -65,10 +65,10 @@ void Discovery::discoveryFinished(int exitCode, QProcess::ExitStatus exitStatus)
if (exitCode != 0 || exitStatus != QProcess::NormalExit) { if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
qCWarning(dcNetworkDetector()) << "Nmap error failed. Is nmap installed correctly?"; qCWarning(dcNetworkDetector()) << "Nmap error failed. Is nmap installed correctly?";
emit finished({});
m_discoveryProcesses.removeAll(discoveryProcess); m_discoveryProcesses.removeAll(discoveryProcess);
discoveryProcess->deleteLater(); discoveryProcess->deleteLater();
discoveryProcess = nullptr; discoveryProcess = nullptr;
finishDiscovery();
return; return;
} }
@ -139,7 +139,7 @@ void Discovery::discoveryFinished(int exitCode, QProcess::ExitStatus exitStatus)
if (foundHosts == 0 && m_discoveryProcesses.isEmpty()) { if (foundHosts == 0 && m_discoveryProcesses.isEmpty()) {
qCDebug(dcNetworkDetector()) << "Network scan successful but no hosts found in this network"; qCDebug(dcNetworkDetector()) << "Network scan successful but no hosts found in this network";
emit finished({}); finishDiscovery();
} }
} }