Merge pull request #92 from enthought/rework-setUrl

rework setUrl wait on eventloop

jigna/core/proxy_qwebview.py

@@ -118,18 +118,20 @@ def setUrl(self, url):
         http://doc.qt.digia.com/qq/qq27-responsive-guis.html#waitinginalocaleventloop
         """
         event_loop = QtCore.QEventLoop()
-        self._loaded = False
+        page = self._page
+        loaded = [False]
 
-        def on_load():
-            self._loaded = True
+        def on_load(ok):
+            loaded[0] = True
             event_loop.quit()
 
-        self._page.loadFinished.connect(on_load)
-
-        super(ProxyQWebView, self).setUrl(QtCore.QUrl(url))
-
-        if not self._loaded:
-            event_loop.exec_()
+        page.loadFinished.connect(on_load)
+        try:
+            super(ProxyQWebView, self).setUrl(QtCore.QUrl(url))
+            if not loaded[0]:
+                event_loop.exec_()
+        finally:
+            page.loadFinished.disconnect(on_load)
 
     #### Private protocol #####################################################