diff -r 3a8bedba97ab -r 2c4441d65ee3 WebBrowser/WebBrowserWindow.py --- a/WebBrowser/WebBrowserWindow.py Thu Jun 29 18:51:03 2017 +0200 +++ b/WebBrowser/WebBrowserWindow.py Thu Jun 29 19:21:52 2017 +0200 @@ -107,6 +107,7 @@ _imageSearchEngine = None _autoScroller = None _tabManager = None + _sessionManager = None def __init__(self, home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, @@ -427,6 +428,8 @@ self.__hideNavigationTimer.setSingleShot(True) self.__hideNavigationTimer.timeout.connect(self.__hideNavigation) + self.sessionManager() + QTimer.singleShot(0, syncMgr.loadSettings) def __del__(self): @@ -3083,6 +3086,8 @@ self.virustotalDomainReportAct.setEnabled(True) self.__javaScriptIcon.preferencesChanged() + + self.sessionManager().preferencesChanged() def masterPasswordChanged(self, oldPassword, newPassword): """ @@ -4648,3 +4653,21 @@ cls._webProfile.scripts().insert(script) return cls._webProfile + + #################################################### + ## Methods below implement session related functions + #################################################### + + @classmethod + def sessionManager(cls): + """ + Class method to get a reference to the session manager. + + @return reference to the session manager + @rtype SessionManager + """ + if cls._sessionManager is None and not cls._isPrivate: + from .Session.SessionManager import SessionManager + cls._sessionManager = SessionManager() + + return cls._sessionManager