Fix app single instance lock (#385)
This commit is contained in:
parent
48a529dd51
commit
fdfbad68e2
1 changed files with 40 additions and 34 deletions
|
@ -84,16 +84,6 @@ const installExtensions = async () => {
|
|||
.catch(console.log);
|
||||
};
|
||||
|
||||
const singleInstance = app.requestSingleInstanceLock();
|
||||
|
||||
if (!singleInstance) {
|
||||
app.quit();
|
||||
} else {
|
||||
app.on('second-instance', () => {
|
||||
mainWindow?.show();
|
||||
});
|
||||
}
|
||||
|
||||
const RESOURCES_PATH = app.isPackaged
|
||||
? path.join(process.resourcesPath, 'assets')
|
||||
: path.join(__dirname, '../../assets');
|
||||
|
@ -666,6 +656,21 @@ const FONT_HEADERS = [
|
|||
'font/woff2',
|
||||
];
|
||||
|
||||
const singleInstance = app.requestSingleInstanceLock();
|
||||
|
||||
if (!singleInstance) {
|
||||
app.quit();
|
||||
} else {
|
||||
app.on('second-instance', () => {
|
||||
if (mainWindow) {
|
||||
if (mainWindow.isMinimized()) {
|
||||
mainWindow.restore();
|
||||
}
|
||||
|
||||
mainWindow.focus();
|
||||
}
|
||||
});
|
||||
|
||||
app.whenReady()
|
||||
.then(() => {
|
||||
protocol.handle('feishin', async (request) => {
|
||||
|
@ -694,3 +699,4 @@ app.whenReady()
|
|||
});
|
||||
})
|
||||
.catch(console.log);
|
||||
}
|
||||
|
|
Reference in a new issue