Fix exception when webpage.close() is called twice at the same time

Refs #237
laurentj · Oct 14, 2014 · 005bde7 · 005bde7
1 parent 8015d76
commit 005bde7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -19,6 +19,7 @@ Improvements
 Fixed bugs
 ----------
 
+   * Two calls of webpage.close() may trigger an exception.
    * Webserver: request.post was not filled correctly (not an object) when the
      content is application/x-www-form-urlencoded (#228)
    * Cookies: cookies set with ``phantom`` or ``webpage`` were not visible by default

diff --git a/src/modules/slimer-sdk/webpage.js b/src/modules/slimer-sdk/webpage.js
@@ -713,7 +713,9 @@ function _create(parentWebpageInfo) {
                 try {
                     Services.console.unregisterListener(jsErrorListener);
                 }catch(e){}
-                Services.obs.removeObserver(webpageObserver, "console-api-log-event");
+                try {
+                    Services.obs.removeObserver(webpageObserver, "console-api-log-event");
+                }catch(e){}
                 netLog.unregisterBrowser(browser);
                 this.closing(this);
                 slLauncher.closeBrowser(browser);