Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserView.py	Mon Oct 03 19:02:45 2016 +0200
+++ b/WebBrowser/WebBrowserView.py	Mon Oct 03 19:12:03 2016 +0200
@@ -167,14 +167,15 @@
             self.__mw.newTab(name)
             return
         
-        if not name.scheme() and not os.path.exists(name.toString()):
-            name.setScheme(Preferences.getWebBrowser("DefaultScheme"))
-        else:
-            if Utilities.isWindowsPlatform():
-                name.setUrl("file:///" + Utilities.fromNativeSeparators(
-                    name.toString()))
+        if not name.scheme():
+            if not os.path.exists(name.toString()):
+                name.setScheme(Preferences.getWebBrowser("DefaultScheme"))
             else:
-                name.setUrl("file://" + name.toString())
+                if Utilities.isWindowsPlatform():
+                    name.setUrl("file:///" + Utilities.fromNativeSeparators(
+                        name.toString()))
+                else:
+                    name.setUrl("file://" + name.toString())
         
         if len(name.scheme()) == 1 or \
            name.scheme() == "file":

--- a/WebBrowser/WebBrowserWindow.py	Mon Oct 03 19:02:45 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Mon Oct 03 19:12:03 2016 +0200
@@ -142,6 +142,7 @@
 
         self.__mHistory = []
         self.__lastConfigurationPageName = ""
+        self.__lastActiveWindow = None
         
         WebBrowserWindow._isPrivate = private
         
@@ -376,7 +377,6 @@
                 if self.__searchWord is not None:
                     QTimer.singleShot(0, self.__searchForWord)
             
-            self.__lastActiveWindow = None
             e5App().focusChanged.connect(self.__appFocusChanged)
             
             QTimer.singleShot(0, syncMgr.loadSettings)