diff -r eb0ffc3f12a2 -r 04083f42042d Helpviewer/HelpBrowserWV.py
--- a/Helpviewer/HelpBrowserWV.py Sat May 15 16:13:24 2010 +0200
+++ b/Helpviewer/HelpBrowserWV.py Sun May 16 18:21:41 2010 +0200
@@ -817,11 +817,12 @@
"""
self.__isLoading = False
self.mw.progressBar().hide()
- self.mw.resetLoading(self)
+ self.mw.resetLoading(self, ok)
self.__iconChanged()
- self.mw.passwordManager().fill(self.page())
+ if ok:
+ self.mw.passwordManager().fill(self.page())
def isLoading(self):
"""
@@ -864,17 +865,17 @@
if reply.error() == QNetworkReply.NoError:
if reply.url().isEmpty():
return
- header = reply.header(QNetworkRequest.ContentLengthHeader)
- size = header
+ size = reply.header(QNetworkRequest.ContentLengthHeader)
if size == 0:
return
if requestFilename is None:
requestFilename = Preferences.getUI("RequestDownloadFilename")
dlg = DownloadDialog(reply, requestFilename, self.page(), download)
- self.connect(dlg, SIGNAL("done()"), self.__downloadDone)
- self.__downloadWindows.append(dlg)
- dlg.show()
+ if dlg.initialize():
+ self.connect(dlg, SIGNAL("done()"), self.__downloadDone)
+ self.__downloadWindows.append(dlg)
+ dlg.show()
else:
replyUrl = reply.url()
if replyUrl.isEmpty():
@@ -914,7 +915,6 @@
dlg = self.sender()
if dlg in self.__downloadWindows:
self.disconnect(dlg, SIGNAL("done()"), self.__downloadDone)
- self.__downloadWindows.remove(dlg)
def __downloadRequested(self, request):
"""
