phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Migrate to new makeSingleInstance method

Browse Source
This commit is contained in:
Yuya Ochiai
2018-11-12 00:26:03 +09:00
parent 70b3aa0531
commit 40257cf93e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.js
View File

@@ -177,13 +177,18 @@ const trayImages = (() => {
})(); })();
// If there is already an instance, activate the window in the existing instace and quit this one // If there is already an instance, activate the window in the existing instace and quit this one
if (app.makeSingleInstance((commandLine/*, workingDirectory*/) => { const gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) {
app.exit();
global.willAppQuit = true;
}
app.on('second-instance', (event, secondArgv) => {
// Protocol handler for win32 // Protocol handler for win32
// argv: An array of the second instance’s (command line / deep linked) arguments // argv: An array of the second instance’s (command line / deep linked) arguments
if (process.platform === 'win32') { if (process.platform === 'win32') {
// Keep only command line / deep linked arguments // Keep only command line / deep linked arguments
if (Array.isArray(commandLine.slice(1)) && commandLine.slice(1).length > 0) { if (Array.isArray(secondArgv.slice(1)) && secondArgv.slice(1).length > 0) {
setDeeplinkingUrl(commandLine.slice(1)[0]); setDeeplinkingUrl(secondArgv.slice(1)[0]);
mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl); mainWindow.webContents.send('protocol-deeplink', deeplinkingUrl);
} }
} }
@@ -196,9 +201,7 @@ if (app.makeSingleInstance((commandLine/*, workingDirectory*/) => {
mainWindow.show(); mainWindow.show();
} }
} }
})) { });
app.exit();
}
function shouldShowTrayIcon() { function shouldShowTrayIcon() {
if (process.platform === 'win32') { if (process.platform === 'win32') {