@@ -97,6 +97,7 @@ DownloadItem::DownloadItem(QNetworkReply *reply, bool requestFileName, QWidget * , m_startedSaving(false) , m_finishedDownloading(false) , m_gettingFileName(false) + , m_canceledFileSelect(false) { setupUi(this); QPalette p = downloadInfoLabel->palette(); @@ -171,6 +172,7 @@ void DownloadItem::getFileName() progressBar->setVisible(false); stop(); fileNameLabel->setText(tr("Download canceled: %1").arg(QFileInfo(defaultFileName).fileName())); + m_canceledFileSelect = true; return; } QFileInfo fileInfo = QFileInfo(fileName); @@ -537,6 +539,9 @@ void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool reques DownloadItem *item = new DownloadItem(reply, requestFileName, this); addItem(item); + if (item->m_canceledFileSelect) + return; + if (!isVisible()) show(); src/downloadmanager.cpp @@ -119,7 +119,10 @@ private: bool m_startedSaving; bool m_finishedDownloading; bool m_gettingFileName; + bool m_canceledFileSelect; QTime m_lastProgressTime; + + friend class DownloadManager; }; class AutoSaver; src/downloadmanager.h c7eb8f26533772d28cb59d7d914a5dfd28009061 Christopher Eby kreed@kreed.org http://github.com/icefox/arora/commit/2ff3d4563da7710d55073001eb7cdf7c10c581f4 2ff3d4563da7710d55073001eb7cdf7c10c581f4 2009-10-15T19:26:31-07:00 2009-10-11T11:44:38-07:00 Don't show the download manager if file selection was canceled Issue 716 595ea6101cb17ff21e36e10ccf92ef4ea2f20a33 Benjamin C Meyer ben@meyerhome.net