mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'jtdx_mac' into 'master' 

Unify process handling

Closes #49

See merge request gridtracker.org/gridtracker!29
Canadian-Provinces-Territories-Award-Layer
Paul Traina 2020-12-05 01:52:11 +00:00
rodzic 5565bd0164 06154adb47
commit c9a8bc6267
1 zmienionych plików z 8 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
package.nw/lib/gt.js
Wyświetl plik

@ -9693,27 +9693,14 @@ function getIniFromApp(appName) {
} }
function checkRunningProcesses() { function checkRunningProcesses() {
const child_process = require("child_process"); var child_process = require("child_process");
var list = ""; var list =
if (g_platform == "windows") { g_platform == "windows"
list = child_process.execFileSync("tasklist.exe"); ? child_process.execFileSync("tasklist.exe")
if (list.indexOf("wsjtx") > -1) g_wsjtxProcessRunning = true; : child_process.execFileSync("ps", ["-aef"]);
else g_wsjtxProcessRunning = false;
if (list.indexOf("jtdx") > -1) g_jtdxProcessRunning = true; g_wsjtxProcessRunning = list.indexOf("wsjtx") > -1;
else g_jtdxProcessRunning = false; g_jtdxProcessRunning = list.indexOf("jtdx") > -1;
} else if (g_platform == "mac") {
list = child_process.execFileSync("ps", ["-aef"]);
if (list.indexOf("jt9 -s WSJT-X") > -1) g_wsjtxProcessRunning = true;
else g_wsjtxProcessRunning = false;
// no jtdx on Mac, woot!
g_jtdxProcessRunning = false;
} else {
list = child_process.execFileSync("ps", ["-aef"]);
if (list.indexOf("wsjtx") > -1) g_wsjtxProcessRunning = true;
else g_wsjtxProcessRunning = false;
if (list.indexOf("jtdx") > -1) g_jtdxProcessRunning = true;
else g_jtdxProcessRunning = false;
}
} }
function updateRunningProcesses() { function updateRunningProcesses() {