[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 05/12: Issue 3431 - Element Hiding Helper shutdown fails ("shutdown is not a function")

[David Prévot]

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

taffit pushed a commit to branch master
in repository adblock-plus-element-hiding-helper.

commit ab1728184f08a10e0168b9c2e440b4f0e4c2ddcf
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Dec 21 19:56:37 2015 +0100

    Issue 3431 - Element Hiding Helper shutdown fails ("shutdown is not a function")
---
 chrome/content/actor.jsm      |  2 +-
 chrome/content/frameScript.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/chrome/content/actor.jsm b/chrome/content/actor.jsm
index f5b1e6f..1857f0a 100644
--- a/chrome/content/actor.jsm
+++ b/chrome/content/actor.jsm
@@ -27,7 +27,7 @@ let actor = {
 
 DebuggerServer.addTabActor(actor, name);
 
-let shutdown = (function()
+var shutdown = (function()
 {
   let executed = false;
   return function()
diff --git a/chrome/content/frameScript.js b/chrome/content/frameScript.js
index 093d899..e6233d6 100644
--- a/chrome/content/frameScript.js
+++ b/chrome/content/frameScript.js
@@ -19,7 +19,15 @@
   function onShutdown()
   {
     shutdown();
-    Cu.unload(module);
+    try
+    {
+      Cu.unload(module);
+    }
+    catch (e)
+    {
+      Cu.reportError(e);
+    }
+
     removeMessageListener("ElemHideHelper:Shutdown", onShutdown);
     removeMessageListener("ElemHideHelper:GetNodeInfo", onGetNodeInfo);
     removeMessageListener("ElemHideHelper:Preview", onTogglePreview);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus-element-hiding-helper.git