github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-snapshot-atom-environment

Browse Source
This commit is contained in:
Antonio Scandurra
2017-03-16 21:08:41 +01:00
parent ea440148d8 306968aa53
commit 81af989f0d
17 changed files with 189 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main-process/atom-application.coffee
View File

@@ -291,7 +291,9 @@ class AtomApplication
@restart()
@disposable.add ipcHelpers.on ipcMain, 'resolve-proxy', (event, requestId, url) ->
event.sender.session.resolveProxy url, (proxy) -> event.sender.send('did-resolve-proxy', requestId, proxy)
event.sender.session.resolveProxy url, (proxy) ->
unless event.sender.isDestroyed()
event.sender.send('did-resolve-proxy', requestId, proxy)
@disposable.add ipcHelpers.on ipcMain, 'did-change-history-manager', (event) =>
for atomWindow in @windows