Fixed an issue in the web browsers.

Sun, 20 Nov 2016 17:42:59 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 20 Nov 2016 17:42:59 +0100
changeset 5341
d874aeb629dc
parent 5340
abbb6f750607
child 5342
2b6821805f46

Fixed an issue in the web browsers.

Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
WebBrowser/WebBrowserWindow.py file | annotate | diff | comparison | revisions
diff -r abbb6f750607 -r d874aeb629dc Helpviewer/HelpWindow.py
--- a/Helpviewer/HelpWindow.py	Sun Nov 20 16:47:33 2016 +0100
+++ b/Helpviewer/HelpWindow.py	Sun Nov 20 17:42:59 2016 +0100
@@ -2662,8 +2662,13 @@
             self.__activating = True
             req = QNetworkRequest(url)
             req.setRawHeader(b"X-Eric6-UserLoadAction", b"1")
-            self.currentBrowser().setSource(
-                None, (req, QNetworkAccessManager.GetOperation, b""))
+            cb = self.currentBrowser()
+            if cb is None:
+                self.newTab(
+                    None, (req, QNetworkAccessManager.GetOperation, b""))
+            else:
+                cb.setSource(
+                    None, (req, QNetworkAccessManager.GetOperation, b""))
             self.__activating = False
         
     def __linksActivated(self, links, keyword):
diff -r abbb6f750607 -r d874aeb629dc WebBrowser/WebBrowserWindow.py
--- a/WebBrowser/WebBrowserWindow.py	Sun Nov 20 16:47:33 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sun Nov 20 17:42:59 2016 +0100
@@ -2964,7 +2964,11 @@
         """
         if not self.__activating:
             self.__activating = True
-            self.currentBrowser().setUrl(url)
+            cb = self.currentBrowser()
+            if cb is None:
+                self.newTab(url)
+            else:
+                cb.setUrl(url)
             self.__activating = False
     
     def __activateCurrentBrowser(self):

eric ide

mercurial