Skip to content

Commit

Permalink
Rebase hell
Browse files Browse the repository at this point in the history
  • Loading branch information
lesleyjanenorton committed Dec 18, 2024
1 parent 6859671 commit b52b94f
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/interventions/killernetwork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,16 @@

#include <qobject.h>

<<<<<<< HEAD
#include <QObject>

#include "platforms/windows/windowsservicemanager.h"
=======
#include "platforms/windows/windowsutils.h"
>>>>>>> 9578cbf61 (Format)

namespace Intervention {

const QString KillerNetwork::id = "intel.killernetwork";

bool KillerNetwork::systemAffected() {
<<<<<<< HEAD
std::unique_ptr<WindowsServiceManager> svm =
WindowsServiceManager::open("Killer Network Service");
if (svm == nullptr) {
return false;
}
return svm->isRunning();
=======
const bool isKillerInstalledAndRunning =
WindowsUtils::getServiceStatus("Killer Network Service");
return isKillerInstalledAndRunning;
>>>>>>> 9578cbf61 (Format)
}

} // namespace Intervention

0 comments on commit b52b94f

Please sign in to comment.