From cdd9c174e79ae9f45a02c2ecda9c0928c8081183 Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Thu, 23 Sep 2021 13:15:27 -0400 Subject: [PATCH] electron always dev tools --- electron/main.js | 4 ++-- src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/electron/main.js b/electron/main.js index 405d4627b..78fcdf488 100644 --- a/electron/main.js +++ b/electron/main.js @@ -5,7 +5,7 @@ function createWindow() { const win = new BrowserWindow({ show: false, webPreferences: { - devTools: false, + devTools: true, }, }); @@ -13,7 +13,7 @@ function createWindow() { win.maximize(); win.loadFile("index.html"); win.show(); - // win.webContents.openDevTools(); + win.webContents.openDevTools(); globalShortcut.register("f5", function () { win.loadFile("index.html"); }); diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx b/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx index 28afd4272..872bb633b 100644 --- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx +++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx @@ -480,7 +480,8 @@ export function queryStatFromString(str) { /******* Working functions *******/ export function resetWorkStatus(generalType, group, workType) { - if (generalType === this.workType && group === this.companyName) return; + if (this.workType !== CONSTANTS.WorkTypeFaction && generalType === this.workType && group === this.companyName) + return; if (generalType === this.workType && group === this.currentWorkFactionName && workType === this.factionWorkType) return; if (this.isWorking) this.singularityStopWork();