Skip to content

Commit

Permalink
Update to new electron single instance API
Browse files Browse the repository at this point in the history
  • Loading branch information
dbkr committed Dec 18, 2018
1 parent 17983c4 commit 60d3076
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions electron_app/src/electron-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,12 @@ ipcMain.on('app_onAction', function(ev, payload) {

app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');

const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => {
// If other instance launched with --hidden then skip showing window
if (commandLine.includes('--hidden')) return;

// Someone tried to run a second instance, we should focus our window.
if (mainWindow) {
if (!mainWindow.isVisible()) mainWindow.show();
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
}
});

if (shouldQuit) {
const gotLock = app.requestSingleInstanceLock();
if (!gotLock) {
console.log('Other instance detected: exiting');
app.exit();
}


const launcher = new AutoLaunch({
name: vectorConfig.brand || 'Riot',
isHidden: true,
Expand Down Expand Up @@ -268,6 +256,18 @@ app.on('before-quit', () => {
}
});

app.on('second-instance', (ev, commandLine, workingDirectory) => {
// If other instance launched with --hidden then skip showing window
if (commandLine.includes('--hidden')) return;

// Someone tried to run a second instance, we should focus our window.
if (mainWindow) {
if (!mainWindow.isVisible()) mainWindow.show();
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.focus();
}
});

// Set the App User Model ID to match what the squirrel
// installer uses for the shortcut icon.
// This makes notifications work on windows 8.1 (and is
Expand Down

0 comments on commit 60d3076

Please sign in to comment.