1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

Always prefer external download manager when set

This commit is contained in:
David Rosca 2016-05-31 18:39:43 +02:00
parent 5f6f0f7bd8
commit 0269541561

View File

@ -215,7 +215,9 @@ void DownloadManager::download(QWebEngineDownloadItem *downloadItem)
QString fileName = QFileInfo(downloadItem->path()).fileName();
fileName = QUrl::fromPercentEncoding(fileName.toUtf8());
if (m_downloadPath.isEmpty()) {
if (m_useExternalManager) {
startExternalManager(downloadItem->url());
} else if (m_downloadPath.isEmpty()) {
// Ask what to do
DownloadOptionsDialog optionsDialog(fileName, downloadItem->url(), mApp->activeWindow());
optionsDialog.showExternalManagerOption(m_useExternalManager);
@ -245,8 +247,6 @@ void DownloadManager::download(QWebEngineDownloadItem *downloadItem)
downloadItem->cancel();
return;
}
} else if (m_useExternalManager) {
startExternalManager(downloadItem->url());
} else {
downloadPath = QzTools::ensureUniqueFilename(m_downloadPath + QL1C('/') + fileName);
}