Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #807 from h3poteto/iss-804 

closes #804 Don't send event to webContents when window is already closed
This commit is contained in:
AkiraFukushima 2018-12-24 22:35:06 +09:00 committed by GitHub
parent ee84c12e26 f1bb90127f
commit abc4bf5818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/index.js
View File

@ -417,7 +417,12 @@ ipcMain.on('start-user-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-user-streaming', err)
// In macOS, sometimes window is closed (not quit).
// When window is closed, we can not send event to webContents; because it is destroyed.
// So we have to guard it.
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-user-streaming', err)
}
}
)
})
@ -455,7 +460,9 @@ ipcMain.on('start-directmessages-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-directmessages-streaming', err)
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-directmessages-streaming', err)
}
}
)
})
@ -493,7 +500,9 @@ ipcMain.on('start-local-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-local-streaming', err)
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-local-streaming', err)
}
}
)
})
@ -531,7 +540,9 @@ ipcMain.on('start-public-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-public-streaming', err)
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-public-streaming', err)
}
}
)
})
@ -569,7 +580,9 @@ ipcMain.on('start-list-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-list-streaming', err)
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-list-streaming', err)
}
}
)
})
@ -607,7 +620,9 @@ ipcMain.on('start-tag-streaming', (event, obj) => {
},
(err) => {
log.error(err)
event.sender.send('error-start-tag-streaming', err)
if (!event.sender.isDestroyed()) {
event.sender.send('error-start-tag-streaming', err)
}
}
)
})