mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Fix download task issues
This commit is contained in:
parent
760df15145
commit
f5ec0e0b8e
3 changed files with 16 additions and 3 deletions
|
@ -43,7 +43,20 @@ public bool IsUploadJob
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return Job != TaskJob.Job || TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost);
|
switch (Job)
|
||||||
|
{
|
||||||
|
case TaskJob.Job:
|
||||||
|
return TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost);
|
||||||
|
case TaskJob.DataUpload:
|
||||||
|
case TaskJob.FileUpload:
|
||||||
|
case TaskJob.TextUpload:
|
||||||
|
case TaskJob.ShortenURL:
|
||||||
|
case TaskJob.ShareURL:
|
||||||
|
case TaskJob.DownloadUpload:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -457,7 +457,7 @@ private static void DownloadFile(string url, bool upload, TaskSettings taskSetti
|
||||||
{
|
{
|
||||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||||
|
|
||||||
WorkerTask task = WorkerTask.CreateDownloadTask(url, true, taskSettings);
|
WorkerTask task = WorkerTask.CreateDownloadTask(url, upload, taskSettings);
|
||||||
|
|
||||||
if (task != null)
|
if (task != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -533,7 +533,7 @@ private bool DoThreadJob()
|
||||||
|
|
||||||
if (Info.Job == TaskJob.Download || Info.Job == TaskJob.DownloadUpload)
|
if (Info.Job == TaskJob.Download || Info.Job == TaskJob.DownloadUpload)
|
||||||
{
|
{
|
||||||
bool downloadResult = !DownloadFromURL(Info.Job == TaskJob.DownloadUpload);
|
bool downloadResult = DownloadFromURL(Info.Job == TaskJob.DownloadUpload);
|
||||||
|
|
||||||
if (!downloadResult)
|
if (!downloadResult)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue