From 1af97ec5aa6c68b0bd4c784a76493d94f3056f7c Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Sun, 7 Aug 2022 11:40:42 -0400 Subject: [PATCH] fix running/worker script comparison --- src/Netscript/killWorkerScript.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Netscript/killWorkerScript.ts b/src/Netscript/killWorkerScript.ts index 2ad5f00bc..1c381e1c6 100644 --- a/src/Netscript/killWorkerScript.ts +++ b/src/Netscript/killWorkerScript.ts @@ -10,7 +10,6 @@ import { WorkerScriptStartStopEventEmitter } from "./WorkerScriptStartStopEventE import { RunningScript } from "../Script/RunningScript"; import { GetServer } from "../Server/AllServers"; -import { compareArrays } from "../utils/helpers/compareArrays"; import { dialogBoxCreate } from "../ui/React/DialogBox"; import { AddRecentScript } from "./RecentScripts"; import { Player } from "../Player"; @@ -33,13 +32,8 @@ export function killWorkerScript(params: killScriptParams): boolean { // If for some reason that doesn't work, we'll try the old way for (const ws of workerScripts.values()) { - if ( - ws.name == params.runningScript.filename && - ws.hostname == params.hostname && - compareArrays(ws.args, params.runningScript.args) - ) { + if (ws.scriptRef === params.runningScript) { stopAndCleanUpWorkerScript(ws); - return true; } } @@ -52,7 +46,6 @@ function killWorkerScriptByPid(pid: number): boolean { const ws = workerScripts.get(pid); if (ws instanceof WorkerScript) { stopAndCleanUpWorkerScript(ws); - return true; } @@ -98,7 +91,7 @@ function removeWorkerScript(workerScript: WorkerScript): void { // Delete the RunningScript object from that server for (let i = 0; i < server.runningScripts.length; ++i) { const runningScript = server.runningScripts[i]; - if (runningScript.filename === name && compareArrays(runningScript.args, workerScript.args)) { + if (runningScript === workerScript.scriptRef) { server.runningScripts.splice(i, 1); break; }