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

Don't throw exception on closed guest window

Browse source
This commit is contained in:
Cheng Zhao 2014-10-27 23:59:11 +08:00
parent cc9ff77dd2
commit 89990ec037
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/lib/guest-window-manager.coffee
View file

@ -55,14 +55,16 @@ ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, args...) ->
[url, frameName, options] = args [url, frameName, options] = args
event.returnValue = createGuest event.sender, url, options event.returnValue = createGuest event.sender, url, options
ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', (event, args...) -> ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_CLOSE', (event, embedderId, guestId) ->
guest = removeGuest args... return unless BrowserWindow.windows.has guestId
guest = removeGuest embedderId, guestId
guest.destroy() guest.destroy()
ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', (event, guestId, method, args...) -> ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_METHOD', (event, guestId, method, args...) ->
guest = BrowserWindow.windows.get guestId return unless BrowserWindow.windows.has guestId
guest[method] args... BrowserWindow.windows.get(guestId)[method] args...
ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestId, method, args...) -> ipc.on 'ATOM_SHELL_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD', (event, guestId, method, args...) ->
return unless BrowserWindow.windows.has guestId
guest = BrowserWindow.windows.get guestId guest = BrowserWindow.windows.get guestId
guest.webContents?[method] args... BrowserWindow.windows.get(guestId).webContents?[method] args...