starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-25 08:25:04 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Bugfix #258: electron.manifest.json - singleInstance not working

Browse Source
This commit is contained in:
Gregor Biswanger
2019-05-22 18:26:43 +02:00
parent 06f43032b4
commit 3a52680a54
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ElectronNET.Host/main.js
View File

@@ -7,18 +7,24 @@ const imageSize = require('image-size');
let io, server, browserWindows, ipc, apiProcess, loadURL;
let appApi, menu, dialogApi, notification, tray, webContents;
let globalShortcut, shellApi, screen, clipboard, autoUpdater;
let splashScreen, mainWindowId, hostHook;
let splashScreen, hostHook;
const currentBinPath = path.join(__dirname.replace('app.asar', ''), 'bin');
const manifestJsonFilePath = path.join(currentBinPath, 'electron.manifest.json');
const manifestJsonFile = require(manifestJsonFilePath);
if (manifestJsonFile.singleInstance) {
const shouldQuit = app.requestSingleInstanceLock();
app.on('second-instance', (commandLine, workingDirectory) => {
mainWindowId && BrowserWindow.fromId(mainWindowId) && BrowserWindow.fromId(mainWindowId).show();
const mainInstance = app.requestSingleInstanceLock();
app.on('second-instance', () => {
const windows = BrowserWindow.getAllWindows();
if (windows.length) {
if (windows[0].isMinimized()) {
windows[0].restore();
}
windows[0].focus();
}
});
if (shouldQuit) {
if (!mainInstance) {
app.quit();
}
}
@@ -37,9 +43,9 @@ app.on('ready', () => {
});
function isSplashScreenEnabled() {
if(manifestJsonFile.hasOwnProperty('splashscreen')) {
if(manifestJsonFile.splashscreen.hasOwnProperty('imageFile')) {
return Boolean(manifestJsonFile.splashscreen.imageFile);
if (manifestJsonFile.hasOwnProperty('splashscreen')) {
if (manifestJsonFile.splashscreen.hasOwnProperty('imageFile')) {
return Boolean(manifestJsonFile.splashscreen.imageFile);
}
}