[Pkg-mozext-commits] [requestpolicy] 44/65: [fix] _updateBlockedContentStateAfterTimeout just before add-on shutdown

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit d457bb03f1c85844295c69818fff6212977717aa
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Feb 1 16:41:36 2016 +0100

    [fix] _updateBlockedContentStateAfterTimeout just before add-on shutdown
    
    Some marionette tests erratically failed:
    
    """
    Unable to complete _updateBlockedContentState actions:
    TypeError: RequestSet is not a constructor
    """
    
    specifically on tests that involved add-on disabling and
    enabling.
---
 src/content/ui/overlay.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 1bd5821..fa4c18c 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -680,7 +680,12 @@ window.rpcontinued.overlay = (function() {
   self._updateBlockedContentStateAfterTimeout = function() {
     const browser = gBrowser.selectedBrowser;
     blockedContentCheckTimeoutId = window.setTimeout(function() {
-      rpcontinued.overlay._updateBlockedContentState(browser);
+      try {
+        rpcontinued.overlay._updateBlockedContentState(browser);
+      } catch (e) {
+        // It's possible that the add-on has been disabled
+        // in the meantime.
+      }
     }, blockedContentStateUpdateDelay);
   };
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git