mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Do not access default session before app is ready

Browse source
This commit is contained in:
Cheng Zhao 2016-07-12 19:39:06 +09:00
parent fcd3357fb8
commit 45500701f1
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/browser/api/protocol.js
View file

@ -1,4 +1,4 @@
const {session} = require('electron') const {app, session} = require('electron')
// Global protocol APIs. // Global protocol APIs.
module.exports = process.atomBinding('protocol') module.exports = process.atomBinding('protocol')
@ -6,10 +6,18 @@ module.exports = process.atomBinding('protocol')
// Fallback protocol APIs of default session. // Fallback protocol APIs of default session.
Object.setPrototypeOf(module.exports, new Proxy({}, { Object.setPrototypeOf(module.exports, new Proxy({}, {
get (target, property) { get (target, property) {
return (...args) => session.defaultSession.protocol[property](...args) if (!app.isReady()) return
const protocol = session.defaultSession.protocol
if (!protocol.hasOwnProperty(property)) return
// Returning a native function directly would throw error.
return (...args) => protocol[property](...args)
}, },
ownKeys () { ownKeys () {
if (!app.isReady()) return []
return Object.getOwnPropertyNames(session.defaultSession.protocol) return Object.getOwnPropertyNames(session.defaultSession.protocol)
}, },