WebBrowser/WebBrowserView.py

changeset 5793
4ff73b969ab1
parent 5785
7c7c5f9e4fad
child 5797
8bc870b7a8a6
--- a/WebBrowser/WebBrowserView.py	Thu Jul 06 19:13:51 2017 +0200
+++ b/WebBrowser/WebBrowserView.py	Fri Jul 07 19:05:53 2017 +0200
@@ -1917,8 +1917,8 @@
         loop is running.
         """
         if self.__restoreData:
-            self.loadFromSessionData(self.__restoreData)
-            self.__restoreData = None
+            sessionData,  self.__restoreData = self.__restoreData, None
+            self.loadFromSessionData(sessionData)
     
     def showEvent(self, evt):
         """
@@ -1934,7 +1934,7 @@
         """
         Private slot to activate a restored session.
         """
-        if self.__restoreData:
+        if self.__restoreData and not self.__mw.isClosing():
             QTimer.singleShot(0, self.__showEventSlot)
     
     def getSessionData(self):

eric ide

mercurial