kopia lustrzana https://github.com/dceejay/electron-node-red
bump electron package dep and prevent multiple instances
rodzic
ac98d1cc3d
commit
794b47c67e
24
main.js
24
main.js
|
@ -50,6 +50,9 @@ const BrowserWindow = electron.BrowserWindow;
|
||||||
const Tray = electron.Tray;
|
const Tray = electron.Tray;
|
||||||
const { TouchBarButton, TouchBarSpacer } = TouchBar;
|
const { TouchBarButton, TouchBarSpacer } = TouchBar;
|
||||||
|
|
||||||
|
const gotTheLock = app.requestSingleInstanceLock()
|
||||||
|
if (!gotTheLock) { console.log("Second instance - quitting."); app.quit(); }
|
||||||
|
|
||||||
var RED = require("node-red");
|
var RED = require("node-red");
|
||||||
var red_app = express();
|
var red_app = express();
|
||||||
|
|
||||||
|
@ -123,7 +126,7 @@ console.log("FlowFile :",flowfile);
|
||||||
|
|
||||||
// Keep a global reference of the window objects, if you don't, the window will
|
// Keep a global reference of the window objects, if you don't, the window will
|
||||||
// be closed automatically when the JavaScript object is garbage collected.
|
// be closed automatically when the JavaScript object is garbage collected.
|
||||||
let mainWindow;
|
let mainWindow = null;
|
||||||
let conWindow;
|
let conWindow;
|
||||||
let tray;
|
let tray;
|
||||||
let logBuffer = [];
|
let logBuffer = [];
|
||||||
|
@ -496,9 +499,22 @@ function createTray() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Called when Electron has finished initialization and is ready to create browser windows.
|
// Called when Electron has finished initialization and is ready to create browser windows.
|
||||||
app.on('ready', () => {
|
// app.on('ready', () => {
|
||||||
createTray()
|
// createTray()
|
||||||
createWindow()
|
// myWindow = createWindow()
|
||||||
|
// })
|
||||||
|
|
||||||
|
app.whenReady().then(() => {
|
||||||
|
createTray();
|
||||||
|
createWindow();
|
||||||
|
})
|
||||||
|
|
||||||
|
app.on('second-instance', (event, commandLine, workingDirectory) => {
|
||||||
|
// Someone tried to run a second instance, we should focus our window.
|
||||||
|
if (mainWindow) {
|
||||||
|
if (mainWindow.isMinimized()) { mainWindow.restore(); }
|
||||||
|
mainWindow.focus();
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Quit when all windows are closed.
|
// Quit when all windows are closed.
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"electron-is-dev": "^1.2.0",
|
"electron-is-dev": "^1.2.0",
|
||||||
"electron-store": "^6.0.0",
|
"electron-store": "^7.0.0",
|
||||||
"express": "^4.17.1",
|
"express": "^4.17.1",
|
||||||
"node-red": "1.2.7",
|
"node-red": "1.2.7",
|
||||||
"node-red-contrib-play-audio": "*",
|
"node-red-contrib-play-audio": "*",
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/dceejay/electron-node-red#readme",
|
"homepage": "https://github.com/dceejay/electron-node-red#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "~10.1.5",
|
"electron": "~11.2.1",
|
||||||
"electron-builder": "^22.9.1"
|
"electron-builder": "^22.9.1"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
|
Ładowanie…
Reference in New Issue