1 files changed, 40 insertions, 46 deletions

diff --git a/src/main.ts b/src/main.ts
index 9009b6f..202e24b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,16 +4,10 @@ import { app, BrowserWindow, ipcMain, remote, Tray, Menu, dialog } from 'electro
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 export let mainWindow: BrowserWindow;
-const isSecondInstance = app.makeSingleInstance(() => {
-   // Someone tried to run a second instance, we should focus our window.
-   if (mainWindow) {
-     if (mainWindow.isMinimized()) mainWindow.restore()
-     mainWindow.focus()
-   }
- })
-
-if (isSecondInstance) {
-   app.quit();
+
+if (!app.requestSingleInstanceLock()) {
+  // Someone tried to run a second instance
+  app.quit();
 }
 const createWindow = () => {
   // Create the browser window.
@@ -23,7 +17,7 @@ const createWindow = () => {
     minHeight: 475,
     minWidth: 650,
     frame: false,
-    icon: path.join(__dirname,"../assets/media/icon.ico")
+    icon: path.join(__dirname, "../assets/media/icon.ico")
   });
 
   // and load the index.html of the app.
@@ -60,50 +54,50 @@ app.on('activate', () => {
   }
 });
 
-ipcMain.on('quit', (event:any, arg:any)=> {
-   mainWindow.close();
+ipcMain.on('quit', (event: any, arg: any) => {
+  mainWindow.close();
 });
 
-ipcMain.on('minimize', (event:any, arg:any)=> {
+ipcMain.on('minimize', (event: any, arg: any) => {
   mainWindow.minimize();
 });
 
-ipcMain.on('debug', (event:any, arg:any)=> {
-   if(mainWindow.webContents.isDevToolsOpened())
+ipcMain.on('debug', (event: any, arg: any) => {
+  if (mainWindow.webContents.isDevToolsOpened())
     mainWindow.webContents.closeDevTools();
-   else
+  else
     mainWindow.webContents.openDevTools();
 
   Status.setActivity("Debug menue Toggled")
 });
 
-import {Status, EventEmitter} from './main/status';
+import { Status, EventEmitter } from './main/status';
 
 
 
-import {quit as drpcQuit} from './main/richpresence';
+import { quit as drpcQuit } from './main/richpresence';
 
 app.on('quit', () => {
   drpcQuit();
   if (appIcon) appIcon.destroy()
 });
 
-let appIcon:Tray = null;
+let appIcon: Tray = null;
 
-EventEmitter.on('openTray',()=>{
-  if(!appIcon){
-  const iconName = "../assets/media/plushmouboo.png";
-  const iconPath = path.join(__dirname, iconName)
-  appIcon = new Tray(iconPath)
+EventEmitter.on('openTray', () => {
+  if (!appIcon) {
+    const iconName = "../assets/media/plushmouboo.png";
+    const iconPath = path.join(__dirname, iconName)
+    appIcon = new Tray(iconPath)
 
-  updateTrayIconMenue();
-}
+    updateTrayIconMenue();
+  }
 });
 
-function updateTrayIconMenue(){
-  if(appIcon && appIcon!==null){
-    let menue:Electron.MenuItemConstructorOptions[] = [];
-    if(Status.getStatus().gameRunning){
+function updateTrayIconMenue() {
+  if (appIcon && appIcon !== null) {
+    let menue: Electron.MenuItemConstructorOptions[] = [];
+    if (Status.getStatus().gameRunning) {
       menue.push({
         label: 'Open screenshot folder',
         click: () => {
@@ -121,13 +115,13 @@ function updateTrayIconMenue(){
             buttons: ['Yes', 'No']
           }
           dialog.showMessageBox(options, (index) => {
-            if(index===0){
+            if (index === 0) {
               EventEmitter.emit('Mana:killMana');
             }
           })
         }
       });
-    }else{
+    } else {
       menue.push({
         label: 'Close Tray Icon',
         click: () => {
@@ -144,7 +138,7 @@ function updateTrayIconMenue(){
 
 EventEmitter.on('status', updateTrayIconMenue);
 
-EventEmitter.on('closeTray',()=>{
+EventEmitter.on('closeTray', () => {
   if (appIcon) {
     appIcon.destroy();
     appIcon = null;
@@ -156,30 +150,30 @@ import { ManaPlus } from './main/manaplus/manaplus';
 
 ManaPlus.init();
 
-ipcMain.on('play', async (event:any, arg:any) => {
-  if(Status.getStatus().playing)return;
-   //console.log("play", arg);
-   Status.setGameStatus({server: arg.address})
-   Status.setPlaying(true);
-   await ManaPlus.start(arg);
-   //Status.showError("Failed To Launch Mana Plus","Not implemented yet!","Launch Manaplus faild: Not Implemented");
-   return false;
+ipcMain.on('play', async (event: any, arg: any) => {
+  if (Status.getStatus().playing) return;
+  //console.log("play", arg);
+  Status.setGameStatus({ server: arg.address })
+  Status.setPlaying(true);
+  await ManaPlus.start(arg);
+  //Status.showError("Failed To Launch Mana Plus","Not implemented yet!","Launch Manaplus faild: Not Implemented");
+  return false;
 });
 
-ipcMain.on('dragFileOut', (event:any, filepath:any) => {
+ipcMain.on('dragFileOut', (event: any, filepath: any) => {
   event.sender.startDrag({
     file: filepath,
-    icon:path.join(__dirname, "../assets/media/screenshot.png")
+    icon: path.join(__dirname, "../assets/media/screenshot.png")
   })
 })
 
-EventEmitter.on('reopenWindow',()=>{
+EventEmitter.on('reopenWindow', () => {
   if (mainWindow === null) {
     createWindow();
   }
 });
 
-EventEmitter.on('closeWindow',()=>{
+EventEmitter.on('closeWindow', () => {
   if (mainWindow !== null) {
     mainWindow.close();
   }