Bug 927568 - fix misplaced null check in marionette-server.js, r=mdas

This commit is contained in:
Andrew Halberstadt 2013-10-21 10:32:48 -04:00
parent deed89ed73
commit 35558e8e7d

View File

@ -2181,7 +2181,7 @@ MarionetteServerConnection.prototype = {
Services.wm.getOuterWindowWithId(message.json.value);
//go in here if we're already in a remote frame.
if (!listenerWindow || (listenerWindow.location.href != message.json.href) &&
if ((!listenerWindow || listenerWindow.location.href != message.json.href) &&
(this.curBrowser.frameManager.currentRemoteFrame !== null)) {
// The outerWindowID from an OOP frame will not be meaningful to
// the parent process here, since each process maintains its own