Skip to content

Support for single instance for electron 4+ #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dorian-coygo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for single instance for electron 4+ #275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cbfbfc
fix: singleInstance w/ electron 4+
May 31, 2020
135b467
fix second-instance function for app.on
May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions skeleton/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,29 @@ export default class App {
applySingleInstance() {
if ('singleInstance' in this.settings && this.settings.singleInstance) {
this.l.verbose('setting single instance mode');
const isSecondInstance = app.makeSingleInstance(() => {
// Someone tried to run a second instance, we should focus our window.
if (this.window) {
if (this.window.isMinimized()) {
this.window.restore();
if (semver.lt(process.versions.electron, '4.0.0')) { //https://www.electronjs.org/docs/all#appmakesingleinstance
const isSecondInstance = app.makeSingleInstance(() => {
// Someone tried to run a second instance, we should focus our window.
if (this.window) {
if (this.window.isMinimized()) {
this.window.restore();
}
this.window.focus();
}
this.window.focus();
}
});

if (isSecondInstance) {
this.l.warn('current instance was terminated because another instance is running');
app.quit();
});
} else {
app.requestSingleInstanceLock()
const isSecondInstance = app.on('second-instance', () => {
// Someone tried to run a second instance, we should focus our window.
if (this.window) {
if (this.window.isMinimized()) {
this.window.restore();
}
this.window.focus();
}
this.l.warn('current instance was terminated because another instance is running');
app.quit();
});
}
}
}
Expand Down