From 7fcb0176fcf25e7efe71b28b290839da2b52f65f Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sat, 21 Nov 2015 10:53:43 -0500
Subject: [PATCH] #955: merging 1.3.6 changes

---
 platform/firefox/vapi-background.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/firefox/vapi-background.js b/platform/firefox/vapi-background.js
index e27c38052..81d0d57c4 100644
--- a/platform/firefox/vapi-background.js
+++ b/platform/firefox/vapi-background.js
@@ -2387,10 +2387,10 @@ vAPI.toolbarButton = {
     // https://github.com/gorhill/uBlock/issues/955
     // Defer until `NativeWindow` is available.
     tbb.initOne = function(win, tryCount) {
-        if ( typeof tryCount !== 'number' ) {
-            tryCount = 0;
-        }
         if ( !win.NativeWindow ) {
+            if ( typeof tryCount !== 'number' ) {
+                tryCount = 0;
+            }
             tryCount += 1;
             if ( tryCount < 10 ) {
                 vAPI.setTimeout(