Skip to content
Prev Previous commit
Next Next commit
fix: try to work on windows
  • Loading branch information
antonreshetov committed Aug 13, 2022
commit 4700f54cd26c398e3786fb652897a8a03061b316
15 changes: 12 additions & 3 deletions src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { checkForUpdateWithInterval } from './services/update-check'

const isDev = process.env.NODE_ENV === 'development'
const isMac = process.platform === 'darwin'
const isLocked = app.requestSingleInstanceLock()
const gotTheLock = app.requestSingleInstanceLock()

let mainWindow: BrowserWindow

Expand All @@ -22,7 +22,10 @@ const apiServer = new ApiServer()
subscribeToChannels()
subscribeToDialog()

if (!isLocked) app.quit()
if (!gotTheLock) {
// @ts-ignore
return app.quit()
}

function createWindow () {
const bounds = store.app.get('bounds')
Expand Down Expand Up @@ -89,14 +92,20 @@ app.on('browser-window-focus', () => {
BrowserWindow.getFocusedWindow()?.webContents.send('main:focus')
})

app.on('second-instance', () => {
app.on('second-instance', (e, argv) => {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore()
mainWindow.focus()
}

if (process.platform !== 'darwin') {
const url = argv.find(i => i.startsWith('masscode://'))
BrowserWindow.getFocusedWindow()?.webContents.send('main:app-protocol', url)
}
})

app.on('open-url', (event, url) => {
console.log('open url')
BrowserWindow.getFocusedWindow()?.webContents.send('main:app-protocol', url)
})

Expand Down
4 changes: 4 additions & 0 deletions src/main/services/api/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ export class ApiServer {
}
}

// Почему то на windows даже при том что порт API свободен,
// API сервер падает, поэтому просто обрабатываем ошибку
server.on('error', err => console.error(err))

return server
}

Expand Down