Fix Exception when dropping .torrent file onto Dock icon when app is closed

Fixes #154
This commit is contained in:
Feross Aboukhadijeh
2016-03-19 15:59:22 -07:00
parent e9db07e855
commit 4f40e5d963
7 changed files with 35 additions and 18 deletions

View File

@@ -1,5 +1,3 @@
var startTime = Date.now()
var electron = require('electron')
var ipc = require('./ipc')
var menu = require('./menu')
@@ -8,8 +6,11 @@ var windows = require('./windows')
var app = electron.app
app.on('open-file', onOpen)
app.on('open-url', onOpen)
app.ipcReady = false // main window has finished loading and IPC is ready
app.isQuitting = false
app.startTime = startTime
app.on('ready', function () {
menu.init()
@@ -17,9 +18,6 @@ app.on('ready', function () {
shortcuts.init()
})
app.on('open-file', onOpen)
app.on('open-url', onOpen)
app.on('before-quit', function () {
app.isQuitting = true
})
@@ -42,5 +40,13 @@ ipc.init()
function onOpen (e, torrentId) {
e.preventDefault()
windows.main.send('dispatch', 'openFiles', torrentId)
console.log(app.ipcReady)
if (app.ipcReady) {
openFiles()
} else {
app.on('ipcReady', openFiles)
}
function openFiles () {
windows.main.send('dispatch', 'openFiles', torrentId)
}
}