rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

downloads: Make sure read timer is stopped.

Browse Source 
Hopefully fixes #307.
This commit is contained in:
Florian Bruhin 2014-12-08 16:16:03 +01:00
parent 07fed5a401
commit 4ab4ac3db6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qutebrowser/browser/downloads.py
View File

@ -298,13 +298,13 @@ class DownloadItem(QObject):
def cancel(self): def cancel(self):
"""Cancel the download.""" """Cancel the download."""
log.downloads.debug("cancelled") log.downloads.debug("cancelled")
self._read_timer.stop()
self.cancelled.emit() self.cancelled.emit()
if self.reply is not None: if self.reply is not None:
self.reply.finished.disconnect(self.on_reply_finished) self.reply.finished.disconnect(self.on_reply_finished)
self.reply.abort() self.reply.abort()
self.reply.deleteLater() self.reply.deleteLater()
self.reply = None self.reply = None
self._read_timer.stop()
if self.fileobj is not None: if self.fileobj is not None:
self.fileobj.close() self.fileobj.close()
if self._filename is not None and os.path.exists(self._filename): if self._filename is not None and os.path.exists(self._filename):
@ -380,6 +380,7 @@ class DownloadItem(QObject):
def finish_download(self): def finish_download(self):
"""Write buffered data to disk and finish the QNetworkReply.""" """Write buffered data to disk and finish the QNetworkReply."""
log.downloads.debug("Finishing download...") log.downloads.debug("Finishing download...")
self._read_timer.stop()
if self.reply.isOpen(): if self.reply.isOpen():
self.fileobj.write(self.reply.readAll()) self.fileobj.write(self.reply.readAll())
if self.autoclose: if self.autoclose:
@ -388,7 +389,6 @@ class DownloadItem(QObject):
self.reply.close() self.reply.close()
self.reply.deleteLater() self.reply.deleteLater()
self.reply = None self.reply = None
self._read_timer.stop()
self.finished.emit() self.finished.emit()
log.downloads.debug("Download finished") log.downloads.debug("Download finished")
@ -467,6 +467,7 @@ class DownloadItem(QObject):
request.setUrl(new_url) request.setUrl(new_url)
reply = self.reply reply = self.reply
reply.finished.disconnect(self.on_reply_finished) reply.finished.disconnect(self.on_reply_finished)
self._read_timer.stop()
self.reply = None self.reply = None
if self.fileobj is not None: if self.fileobj is not None:
self.fileobj.seek(0) self.fileobj.seek(0)