diff -r 6dc5b1db7bdc -r 349308e84eeb eric6/WebBrowser/WebBrowserWindow.py
--- a/eric6/WebBrowser/WebBrowserWindow.py Mon Apr 12 18:25:52 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py Mon Apr 12 19:05:23 2021 +0200
@@ -2760,9 +2760,12 @@
@return flag indicating successful shutdown (boolean)
"""
- if not WebBrowserWindow._performingShutdown and not self.__forcedClose:
- if not self.__tabWidget.shallShutDown():
- return False
+ if (
+ not WebBrowserWindow._performingShutdown and
+ not self.__forcedClose and
+ not self.__tabWidget.shallShutDown()
+ ):
+ return False
self.__isClosing = True
@@ -2804,19 +2807,18 @@
try:
browserIndex = WebBrowserWindow.BrowserWindows.index(self)
- if len(WebBrowserWindow.BrowserWindows):
- if browserIndex == 0:
- if len(WebBrowserWindow.BrowserWindows) > 1:
- # first window will be deleted
- QDesktopServices.setUrlHandler(
- "http",
- WebBrowserWindow.BrowserWindows[1].urlHandler)
- QDesktopServices.setUrlHandler(
- "https",
- WebBrowserWindow.BrowserWindows[1].urlHandler)
- else:
- QDesktopServices.unsetUrlHandler("http")
- QDesktopServices.unsetUrlHandler("https")
+ if len(WebBrowserWindow.BrowserWindows) and browserIndex == 0:
+ if len(WebBrowserWindow.BrowserWindows) > 1:
+ # first window will be deleted
+ QDesktopServices.setUrlHandler(
+ "http",
+ WebBrowserWindow.BrowserWindows[1].urlHandler)
+ QDesktopServices.setUrlHandler(
+ "https",
+ WebBrowserWindow.BrowserWindows[1].urlHandler)
+ else:
+ QDesktopServices.unsetUrlHandler("http")
+ QDesktopServices.unsetUrlHandler("https")
if len(WebBrowserWindow.BrowserWindows) > 0:
del WebBrowserWindow.BrowserWindows[browserIndex]
except ValueError:
