mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 811889 - Set download state to DOWNLOAD_POLICY_BLOCKED if the av scan fails. r=jimm
This commit is contained in:
parent
7a36727700
commit
49e155a2ba
@ -1400,8 +1400,6 @@ nsDownloadManager::AddDownload(DownloadType aDownloadType,
|
|||||||
(void)aMIMEInfo->GetPreferredAction(&action);
|
(void)aMIMEInfo->GetPreferredAction(&action);
|
||||||
}
|
}
|
||||||
|
|
||||||
DownloadState startState = nsIDownloadManager::DOWNLOAD_QUEUED;
|
|
||||||
|
|
||||||
int64_t id = AddDownloadToDB(dl->mDisplayName, source, target, tempPath,
|
int64_t id = AddDownloadToDB(dl->mDisplayName, source, target, tempPath,
|
||||||
dl->mStartTime, dl->mLastUpdate,
|
dl->mStartTime, dl->mLastUpdate,
|
||||||
mimeType, persistentDescriptor, action);
|
mimeType, persistentDescriptor, action);
|
||||||
@ -1409,7 +1407,7 @@ nsDownloadManager::AddDownload(DownloadType aDownloadType,
|
|||||||
dl->mID = id;
|
dl->mID = id;
|
||||||
|
|
||||||
rv = AddToCurrentDownloads(dl);
|
rv = AddToCurrentDownloads(dl);
|
||||||
(void)dl->SetState(startState);
|
(void)dl->SetState(nsIDownloadManager::DOWNLOAD_QUEUED);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
#ifdef DOWNLOAD_SCANNER
|
#ifdef DOWNLOAD_SCANNER
|
||||||
@ -1431,7 +1429,7 @@ nsDownloadManager::AddDownload(DownloadType aDownloadType,
|
|||||||
// This download will get deleted during a call to IAE's Save,
|
// This download will get deleted during a call to IAE's Save,
|
||||||
// so go ahead and mark it as blocked and avoid the download.
|
// so go ahead and mark it as blocked and avoid the download.
|
||||||
(void)CancelDownload(id);
|
(void)CancelDownload(id);
|
||||||
startState = nsIDownloadManager::DOWNLOAD_BLOCKED_POLICY;
|
(void)dl->SetState(nsIDownloadManager::DOWNLOAD_BLOCKED_POLICY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user