Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge branch 'v2.0'

Browse Source
This commit is contained in:
David Rosca 2016-05-31 18:40:10 +02:00
commit 2ff66ae0f5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/downloads/downloadmanager.cpp
View File

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