1 files changed, 11 insertions, 17 deletions
diff --git a/src/main/manaplus/manaplus.ts b/src/main/manaplus/manaplus.ts
index 981c7d5..96cbbd3 100644
--- a/src/main/manaplus/manaplus.ts
+++ b/src/main/manaplus/manaplus.ts
@@ -1,11 +1,12 @@
 import { ManaPlusApp } from "./manaApp/manaApp.interface";
 import { ManaPlusAppWindows } from "./manaApp/windows";
 import * as os from "os";
-import * as path from "path";
+import { join } from "path";
 import * as fs from "fs-extra";
-import { app, ipcMain, shell, dialog } from "electron";
+import { ipcMain, shell, dialog } from "electron";
 import { Status, EventEmitter } from "../status";
 import { ManaPlusAppLinux } from "./manaApp/linux";
+import { getUserDataPath } from "../util/app_constants";
 
 let ManaPlusInstance: ManaPlusApp;
 
@@ -113,9 +114,7 @@ please check you network connection first.",
 }
 
 ipcMain.on("getScreenshots", (event: any, arg: string) => {
-  const screenshotsDir = path.normalize(
-    app.getPath("userData") + `/screenshots/${arg}/`
-  );
+  const screenshotsDir = join(getUserDataPath(), "/screenshots/", `${arg}/`);
   fs.existsSync(screenshotsDir) || fs.mkdirSync(screenshotsDir);
   fs.readdir(screenshotsDir, (err, dir) => {
     let screenshots: string[] = [];
@@ -131,9 +130,7 @@ ipcMain.on("getScreenshots", (event: any, arg: string) => {
 
 EventEmitter.on("Mana:openScreenshotDir", () => {
   shell.openItem(
-    path.normalize(
-      app.getPath("userData") + `/screenshots/${CurrentServer.address}/`
-    )
+    join(getUserDataPath(), `/screenshots/${CurrentServer.address}/`)
   );
 });
 
@@ -159,13 +156,9 @@ async function makeParams(
     }
   }
   // Setup Paths and stuff
-  const configDir = path.normalize(app.getPath("userData") + "/mana_config");
-  const localDataDir = path.normalize(
-    app.getPath("userData") + "/mana_local_data"
-  );
-  const screenshotsDir = path.normalize(
-    app.getPath("userData") + `/screenshots/${server}`
-  );
+  const configDir = join(getUserDataPath(), "/mana_config");
+  const localDataDir = join(getUserDataPath(), "/mana_local_data");
+  const screenshotsDir = join(getUserDataPath(), `/screenshots/${server}`);
   await fs.ensureDir(configDir);
   await fs.ensureDir(localDataDir);
   await fs.ensureDir(screenshotsDir);
@@ -249,8 +242,9 @@ const default_server_config =
 const parseString = require("xml2js").parseString,
   xml2js = require("xml2js");
 async function setSkipUpdateWindows(server: string) {
-  const serverConfigXML = path.normalize(
-    app.getPath("userData") + `/mana_config/${server}/config.xml`
+  const serverConfigXML = join(
+    getUserDataPath(),
+    `/mana_config/${server}/config.xml`
   );
 
   if (fs.existsSync(serverConfigXML)) {