Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Thu Jan 25 17:47:09 2018 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Thu Jan 25 18:50:49 2018 +0100
@@ -458,11 +458,6 @@
             
             self.flashCookieManager()
             
-            if WebBrowserWindow._useQtHelp:
-                QTimer.singleShot(0, self.__lookForNewDocumentation)
-                if self.__searchWord is not None:
-                    QTimer.singleShot(0, self.__searchForWord)
-            
             e5App().focusChanged.connect(self.__appFocusChanged)
             
             self.__toolbarStates = self.saveState()
@@ -481,6 +476,11 @@
             self.sessionManager().activateTimer()
             
             QTimer.singleShot(0, syncMgr.loadSettings)
+            
+            if WebBrowserWindow._useQtHelp:
+                QTimer.singleShot(50, self.__lookForNewDocumentation)
+                if self.__searchWord is not None:
+                    QTimer.singleShot(0, self.__searchForWord)
     
     def __del__(self):
         """
@@ -2985,7 +2985,8 @@
         
         self.networkManager().shutdown()
         
-        self.safeBrowsingManager().close()
+        if WebBrowserWindow._safeBrowsingManager:
+            self.safeBrowsingManager().close()
         
         for browser in WebBrowserWindow.BrowserWindows:
             if browser != self: