Merge branch 'main' into enabledmods

1 files changed, 8 insertions, 8 deletions

diff --git a/src/cli.js b/src/cli.js
index 58385f4..0adcd1d 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -36,7 +36,7 @@ function exit(code) {
 
 // Ensures the gamepath exists, it's called by options that require the
 // gamepath to be able to work.
-function gamepath() {
+function gamepathExists() {
 	if (fs.existsSync("viper.json")) {
 		gamepath = JSON.parse(fs.readFileSync("viper.json", "utf8")).gamepath;
 
@@ -77,9 +77,9 @@ async function init() {
 	}
 
 	// --update
-	if (gamepath() && cli.hasSwitch("update")) {ipcMain.emit("update")}
+	if (cli.hasSwitch("update") && gamepathExists()) {ipcMain.emit("update")}
 	// --version
-	if (gamepath() && cli.hasSwitch("version")) {ipcMain.emit("versioncli")}
+	if (cli.hasSwitch("version") && gamepathExists()) {ipcMain.emit("versioncli")}
 
 	// --setpath
 	if (cli.hasSwitch("setpath")) {
@@ -93,7 +93,7 @@ async function init() {
 	}
 
 	// --launch
-	if (gamepath() && cli.hasSwitch("launch")) {
+	if (gamepathExists() && cli.hasSwitch("launch")) {
 		switch(cli.getSwitchValue("launch")) {
 			case "vanilla":
 				ipcMain.emit("launchVanilla");
@@ -105,12 +105,12 @@ async function init() {
 	}
 
 	// Mod related args, --installmod, --removemod, --togglemod
-	if (gamepath() && cli.hasSwitch("installmod")) {ipcMain.emit("installmod")}
-	if (gamepath() && cli.hasSwitch("removemod")) {ipcMain.emit("removemod", "", cli.getSwitchValue("removemod"))}
-	if (gamepath() && cli.hasSwitch("togglemod")) {ipcMain.emit("togglemod", "", cli.getSwitchValue("togglemod"))}
+	if (cli.hasSwitch("installmod") && gamepathExists()) {ipcMain.emit("installmod")}
+	if (cli.hasSwitch("removemod") && gamepathExists()) {ipcMain.emit("removemod", "", cli.getSwitchValue("removemod"))}
+	if (cli.hasSwitch("togglemod") && gamepathExists()) {ipcMain.emit("togglemod", "", cli.getSwitchValue("togglemod"))}
 
 	// Prints out the list of mods
-	if (gamepath() && cli.hasSwitch("mods")) {ipcMain.emit("getmods")}
+	if (cli.hasSwitch("mods") && gamepathExists()) {ipcMain.emit("getmods")}
 }
 
 module.exports = {