eric6/WebBrowser/Session/SessionManager.py

changeset 7771
787a6b3f8c9f
parent 7759
51aa6c6b66f7
child 7775
4a1db75550bd
--- a/eric6/WebBrowser/Session/SessionManager.py	Fri Oct 09 17:19:29 2020 +0200
+++ b/eric6/WebBrowser/Session/SessionManager.py	Sat Oct 10 12:20:51 2020 +0200
@@ -21,6 +21,7 @@
 )
 
 from E5Gui import E5MessageBox
+from E5Gui.E5OverrideCursor import E5OverrideCursor
 
 import Utilities
 import Preferences
@@ -439,28 +440,27 @@
         if window is None:
             window = WebBrowserWindow.mainWindow()
         
-        QApplication.setOverrideCursor(Qt.WaitCursor)
-        # restore session for first window
-        data = sessionData["Windows"].pop(0)
-        window.tabWidget().loadFromSessionData(data)
-        if "WindowGeometry" in data:
-            geometry = QByteArray.fromBase64(
-                data["WindowGeometry"].encode("ascii"))
-            window.restoreGeometry(geometry)
-        QApplication.processEvents()
-        
-        # restore additional windows
-        for data in sessionData["Windows"]:
-            window = (
-                WebBrowserWindow.mainWindow().newWindow(restoreSession=True)
-            )
+        with E5OverrideCursor():
+            # restore session for first window
+            data = sessionData["Windows"].pop(0)
             window.tabWidget().loadFromSessionData(data)
             if "WindowGeometry" in data:
                 geometry = QByteArray.fromBase64(
                     data["WindowGeometry"].encode("ascii"))
                 window.restoreGeometry(geometry)
             QApplication.processEvents()
-        QApplication.restoreOverrideCursor()
+            
+            # restore additional windows
+            for data in sessionData["Windows"]:
+                window = (
+                    WebBrowserWindow.mainWindow().newWindow(restoreSession=True)
+                )
+                window.tabWidget().loadFromSessionData(data)
+                if "WindowGeometry" in data:
+                    geometry = QByteArray.fromBase64(
+                        data["WindowGeometry"].encode("ascii"))
+                    window.restoreGeometry(geometry)
+                QApplication.processEvents()
         
         if "CurrentWindowIndex" in sessionData:
             currentWindowIndex = sessionData["CurrentWindowIndex"]

eric ide

mercurial