From 1e976895834f09cf11d617246b937f8046cf9c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Thu, 12 Nov 2009 18:25:50 +0100 Subject: [PATCH] Prevent browser_526613.js from closing the main browser window --HG-- extra : rebase_source : 0378fa9b9ff451e84068fcf1f8881cf356f003d7 --- .../sessionstore/test/browser/browser_526613.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/browser/components/sessionstore/test/browser/browser_526613.js b/browser/components/sessionstore/test/browser/browser_526613.js index ab3efbe97af6..d4c0bd506a93 100644 --- a/browser/components/sessionstore/test/browser/browser_526613.js +++ b/browser/components/sessionstore/test/browser/browser_526613.js @@ -82,11 +82,16 @@ function test() { if (this.pass++ == 1) { is(browserWindowsCount(), 2, "Two windows should exist at this point"); - // executeSoon is needed here in order to let the first window be focused - // (see above) - executeSoon(function() { + // let the first window be focused (see above) + var fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager); + if (window == fm.activeWindow) { ss.setBrowserState(oldState); - }); + } else { + window.addEventListener("activate", function () { + window.removeEventListener("activate", arguments.callee, false); + ss.setBrowserState(oldState); + }, false); + } } else { is(browserWindowsCount(), 1, "Only one window should exist after cleanup");