Merge branch 'main' into linux-launch-v2

5 files changed, 20 insertions, 12 deletions

diff --git a/package-lock.json b/package-lock.json
index 341e73c..17cd704 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "viper",
-	"version": "1.11.0",
+	"version": "1.11.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "viper",
-			"version": "1.11.0",
+			"version": "1.11.1",
 			"license": "GPL-3.0-or-later",
 			"dependencies": {
 				"electron-updater": "^4.6.1",
@@ -1546,9 +1546,9 @@
 			"dev": true
 		},
 		"node_modules/ejs": {
-			"version": "3.1.9",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-			"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
 			"dev": true,
 			"dependencies": {
 				"jake": "^10.8.5"
@@ -4936,9 +4936,9 @@
 			"dev": true
 		},
 		"ejs": {
-			"version": "3.1.9",
-			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-			"integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+			"version": "3.1.10",
+			"resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+			"integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
 			"dev": true,
 			"requires": {
 				"jake": "^10.8.5"
diff --git a/package.json b/package.json
index 4c73915..9a7ea79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "viper",
 	"productName": "Viper",
-	"version": "1.11.0",
+	"version": "1.11.1",
 	"description": "Launcher+Updater for TF|2 Northstar",
 	"main": "src/index.js",
 	"build": {
diff --git a/src/modules/gamepath.js b/src/modules/gamepath.js
index 69cc446..5a5f922 100644
--- a/src/modules/gamepath.js
+++ b/src/modules/gamepath.js
@@ -153,7 +153,7 @@ gamepath.set = async (win, force_dialog) => {
 				return gamepath.setting = false;
 			}
 
-			await win().alert(lang("general.missing_path"));
+			await win.alert(lang("general.missing_path"));
 		}
 
 		// fallback to GUI/manual selection
diff --git a/src/modules/is_running.js b/src/modules/is_running.js
index b9fbde1..e2a2d96 100644
--- a/src/modules/is_running.js
+++ b/src/modules/is_running.js
@@ -25,7 +25,7 @@ async function check_processes(processes) {
 		// thing. And it's not much more clunky.
 		let cmd = (() => {
 			switch (process.platform) {
-				case "linux": return "ps a";
+				case "linux": return "ps aux";
 				case "win32": return "tasklist";
 			}
 		})();
@@ -53,7 +53,9 @@ is_running.game = () => {
 is_running.origin = () => {
 	return check_processes([
 		"Origin.exe",
-		"EADesktop.exe"
+		"EADesktop.exe",
+		"CrBrowserMain",
+		"EABackgroundSer"
 	])
 }
 
diff --git a/src/modules/kill.js b/src/modules/kill.js
index 43eda23..5d03218 100644
--- a/src/modules/kill.js
+++ b/src/modules/kill.js
@@ -33,6 +33,12 @@ kill.origin = async () => {
 	let origin = await kill("Origin.exe");
 	let eadesktop = await kill("EADesktop.exe");
 
+	// these should be Linux only, and the above shouldn't succeed if
+	// these don't succeed, so we shouldn't have to check whether these
+	// actually succeeded or not
+	await kill("CrBrowserMain");
+	await kill("EABackgroundSer");
+
 	if (origin || eadesktop) {
 		return true;
 	}