Don't override gBrowser.loadURIWithFlags() in private windows

(enhancement for #42, also related to #46: NoScript wraps the same function after some delay and don't cleanup link to our wrapper)
Infocatcher · May 1, 2013 · 148ce9f · 148ce9f
1 parent 1d9ac0b
commit 148ce9f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/bootstrap.js b/bootstrap.js
@@ -2339,9 +2339,11 @@ API.prototype = {
 	_onFirstPrivateTab: function(window, tab) {
 		this._onFirstPrivateTab = function() {};
 		_log("First private tab in window");
-		window.setTimeout(function() {
-			privateTabInternal.ensureTabBrowserLoadURIPatched(window);
-		}, 50);
+		if(!privateTabInternal.isPrivateWindow(window)) {
+			window.setTimeout(function() {
+				privateTabInternal.ensureTabBrowserLoadURIPatched(window);
+			}, 50);
+		}
 	},
 	// Public API:
 	isTabPrivate: function privateTab_isTabPrivate(tab) {