aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author0neGal <mail@0negal.com>2023-04-16 17:12:23 +0200
committerGitHub <noreply@github.com>2023-04-16 17:12:23 +0200
commit79a478ad3a1bf9dea343e53281b70c56c50838ec (patch)
tree655031f93c3bab2d72a993a12420168d964fb667 /src
parentfb50dbf3694fb0e02da2d203f6247c393c694023 (diff)
parent94d9f9238befbc8cb61721e91b6e7f4a2b364701 (diff)
downloadViper-79a478ad3a1bf9dea343e53281b70c56c50838ec.tar.gz
Viper-79a478ad3a1bf9dea343e53281b70c56c50838ec.zip
Merge pull request #183 from 0neGal/eadesktop-support
feat: Support EA Desktop better
Diffstat (limited to 'src')
-rw-r--r--src/lang/de.json4
-rw-r--r--src/lang/en.json4
-rw-r--r--src/lang/es.json4
-rw-r--r--src/lang/fr.json4
-rw-r--r--src/modules/is_running.js1
-rw-r--r--src/modules/kill.js11
6 files changed, 18 insertions, 10 deletions
diff --git a/src/lang/de.json b/src/lang/de.json
index 2e972d7..1662bef 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -104,8 +104,8 @@
"gui.settings.nsupdate.desc": "Viper wird Northstar automatisch aktualisieren, eine manuelle Aktualisierung ist trotzdem möglich.",
"gui.settings.excludes.title": "Behalte Datein beim aktualisieren.",
"gui.settings.excludes.desc": "Beim Aktualisieren von Northstar werden diese Datein nicht überschrieben. Solang du nicht weißt was du verändert solltest du diese Datein auch nicht berabeiten. Dateinamen sollte durch eine Lücke getrennt werden.",
- "gui.settings.originkill.title": "Automatisch Origin schließen",
- "gui.settings.originkill.desc": "When Viper sich schließt soll Origin sich auch schließen.",
+ "gui.settings.originkill.title": "Automatisch Origin und oder EA Desktop schließen",
+ "gui.settings.originkill.desc": "Wenn Viper sich schließt soll Origin und oder EA Desktop sich auch schließen.",
"gui.update.downloading": "Herunterladen...",
"gui.update.extracting": "Extrahiere update...",
diff --git a/src/lang/en.json b/src/lang/en.json
index f9f84db..4eabbbd 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -104,8 +104,8 @@
"gui.settings.nsupdate.desc": "Viper will automatically keep Northstar up-to-date, however it can still manually be updated through the Northstar page.",
"gui.settings.excludes.title": "Retain files on update",
"gui.settings.excludes.desc": "When Northstar is updated, files specified here will not be overwritten by files from the new Northstar update, unless you know what you're changing, you should probably not change anything here. Each file is separated with a space.",
- "gui.settings.originkill.title": "Automatically quit Origin",
- "gui.settings.originkill.desc": "When Viper exits, automatically quit Origin as well.",
+ "gui.settings.originkill.title": "Automatically quit Origin and or EA Desktop",
+ "gui.settings.originkill.desc": "When Viper exits, automatically quit Origin and or EA Desktop as well.",
"gui.update.downloading": "Downloading...",
"gui.update.extracting": "Extracting update...",
diff --git a/src/lang/es.json b/src/lang/es.json
index bc8a9a9..d0bc189 100644
--- a/src/lang/es.json
+++ b/src/lang/es.json
@@ -99,8 +99,8 @@
"gui.settings.nsupdate.desc": "Viper mantendrá Northstar actualizado automáticamente, sin embargo, todavía se puede actualizar manualmente a través de la sección de Northstar.",
"gui.settings.excludes.title": "Conservar archivos en la actualización",
"gui.settings.excludes.desc": "Cuando se actualice Northstar, los archivos especificados aquí no se sobrescribirán con archivos de la nueva actualización de Northstar. A menos que sepa lo que está cambiando, probablemente no debería cambiar nada aquí. Cada archivo se debe separar con un espacio.",
- "gui.settings.originkill.title": "Cerrar Origin automáticamente",
- "gui.settings.originkill.desc": "Cuando Viper se cierra, cerrar automáticamente Origin también.",
+ "gui.settings.originkill.title": "Cerrar Origin o la aplicación de EA automáticamente",
+ "gui.settings.originkill.desc": "Cuando Viper se cierra, cerrar junto a Origin o la aplicación de EA",
"gui.settings.title.language": "Idioma",
"gui.settings.autolang.title": "Detectar automáticamente el idioma",
"gui.settings.autolang.desc": "Cuando está habilitado, Viper intenta detectar automáticamente el idioma de su sistema, cuando está deshabilitado, puede cambiar manualmente el idioma a continuación.",
diff --git a/src/lang/fr.json b/src/lang/fr.json
index 2cf3957..3ae7272 100644
--- a/src/lang/fr.json
+++ b/src/lang/fr.json
@@ -104,8 +104,8 @@
"gui.settings.nsupdate.desc": "Viper tient automatiquement Northstar à jour (n'empêche pas de le mettre à jour manuellement via sa page dédiée).",
"gui.settings.excludes.title": "Fichiers à conserver",
"gui.settings.excludes.desc": "Lorsque Northstar est mis à jour, ces fichiers ne seront pas écrasés par ceux provenant de la mise à jour; les noms de fichiers sont séparés par un espace.",
- "gui.settings.originkill.title": "Quitter automatiquement Origin",
- "gui.settings.originkill.desc": "Lorsque Viper est fermé, Origin sera également automatiquement fermé.",
+ "gui.settings.originkill.title": "Quitter automatiquement Origin et/ou EA app",
+ "gui.settings.originkill.desc": "Lorsque Viper est fermé, Origin et/ou EA app sera également automatiquement fermé.",
"gui.update.downloading": "Téléchargement de la mise à jour...",
"gui.update.extracting": "Extraction des fichiers...",
diff --git a/src/modules/is_running.js b/src/modules/is_running.js
index 746df5c..1cfdc1d 100644
--- a/src/modules/is_running.js
+++ b/src/modules/is_running.js
@@ -48,6 +48,7 @@ is_running.game = () => {
is_running.origin = () => {
return check_processes([
"Origin.exe",
+ "EADesktop.exe"
])
}
diff --git a/src/modules/kill.js b/src/modules/kill.js
index 7482bed..e0e93fc 100644
--- a/src/modules/kill.js
+++ b/src/modules/kill.js
@@ -20,8 +20,15 @@ async function kill(process_name) {
kill.process = kill;
-kill.origin = () => {
- return kill("Origin.exe");
+kill.origin = async () => {
+ let origin = await kill("Origin.exe");
+ let eadesktop = await kill("EADesktop.exe");
+
+ if (origin || eadesktop) {
+ return true;
+ }
+
+ return false;
}
module.exports = kill;