CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix download task issues

Browse source
This commit is contained in:
Jaex 2016-07-20 13:35:45 +03:00
parent 760df15145
commit f5ec0e0b8e
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ShareX/TaskInfo.cs
View file

@ -43,7 +43,20 @@ public bool IsUploadJob
{
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;
}
}

2
ShareX/UploadManager.cs
View file

@ -457,7 +457,7 @@ private static void DownloadFile(string url, bool upload, TaskSettings taskSetti
{
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
WorkerTask task = WorkerTask.CreateDownloadTask(url, true, taskSettings);
WorkerTask task = WorkerTask.CreateDownloadTask(url, upload, taskSettings);
if (task != null)
{

2
ShareX/WorkerTask.cs
View file

@ -533,7 +533,7 @@ private bool DoThreadJob()
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)
{