Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserTabWidget.py	Mon Jul 03 19:23:54 2017 +0200
+++ b/WebBrowser/WebBrowserTabWidget.py	Tue Jul 04 19:44:30 2017 +0200
@@ -457,13 +457,15 @@
         
         if not restoreSession:
             if not linkName:
-                if Preferences.getWebBrowser("NewTabBehavior") == 1:
+                if Preferences.getWebBrowser("NewTabBehavior") == 0:
+                    linkName = "about:blank"
+                elif Preferences.getWebBrowser("NewTabBehavior") == 1:
                     linkName = Preferences.getWebBrowser("HomePage")
                 elif Preferences.getWebBrowser("NewTabBehavior") == 2:
                     linkName = "eric:speeddial"
-            else:
-                if linkName in ["about:blank", "eric:blank"]:
-                    linkName = ""
+        
+        if linkName == "eric:blank":
+            linkName = "about:blank"
         
         if linkName:
             browser.setSource(QUrl(linkName))
@@ -1214,7 +1216,7 @@
         sessionData["Tabs"] = []
         for index in range(self.count()):
             browser = self.widget(index)
-            data = browser.page().getSessionData()
+            data = browser.getSessionData()
             sessionData["Tabs"].append(data)
         
         return sessionData
@@ -1231,11 +1233,16 @@
         
         # 1. load tab data
         if "Tabs" in sessionData:
+            loadTabOnActivate = True
             for data in sessionData["Tabs"]:
-                browser = self.newBrowser(restoreSession=True)
-                browser.page().loadFromSessionData(data)
+                browser = self.newBrowser(link="about:blank", restoreSession=True)
+                if loadTabOnActivate:
+                    browser.storeSessionData(data)
+                else:
+                    browser.loadFromSessionData(data)
         
         # 2. set tab index
         if "CurrentTabIndex" in sessionData:
             index = tabCount + sessionData["CurrentTabIndex"]
             self.setCurrentIndex(index)
+            self.browserAt(index).show()