From 6888ac04e14c2697a53b3e8d8729ff87b5f457e8 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 20 Mar 2017 09:44:07 +0100 Subject: [PATCH] Fix handling of failed downloads with QtWebEngine --- qutebrowser/browser/webengine/webenginedownloads.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py index 0f7d76c5b..e20440b69 100644 --- a/qutebrowser/browser/webengine/webenginedownloads.py +++ b/qutebrowser/browser/webengine/webenginedownloads.py @@ -78,17 +78,16 @@ class DownloadItem(downloads.AbstractDownloadItem): self.stats.finish() elif state == QWebEngineDownloadItem.DownloadInterrupted: self.successful = False - self.done = True # https://bugreports.qt.io/browse/QTBUG-56839 - self.error.emit("Download failed") - self.stats.finish() + self._die("Download failed") else: raise ValueError("_on_state_changed was called with unknown state " "{}".format(state_name)) def _do_die(self): self._qt_item.downloadProgress.disconnect() - self._qt_item.cancel() + if self._qt_item.state() != QWebEngineDownloadItem.DownloadInterrupted: + self._qt_item.cancel() def _do_cancel(self): self._qt_item.cancel()