Bug 1120809 - Don't fail when trying to retrieve a window from the child process in "Marionette:register".;r=jgriffin

This commit is contained in:
Chris Manchester 2015-01-16 15:01:37 -05:00
Родитель 7c82e6dd0a
Коммит a5bbd53331
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -2933,8 +2933,10 @@ MarionetteServerConnection.prototype = {
// This code processes the content listener's registration information
// and either accepts the listener, or ignores it
let nullPrevious = (this.curBrowser.curFrameId == null);
let listenerWindow =
Services.wm.getOuterWindowWithId(message.json.value);
let listenerWindow = null;
try {
listenerWindow = Services.wm.getOuterWindowWithId(message.json.value);
} catch (ex) { }
//go in here if we're already in a remote frame.
if (this.curBrowser.frameManager.currentRemoteFrame !== null &&