From f5ec0e0b8e0cbb35764dd4f3c7e2e4906ecc4161 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 20 Jul 2016 13:35:45 +0300
Subject: [PATCH] Fix download task issues

---
 ShareX/TaskInfo.cs      | 15 ++++++++++++++-
 ShareX/UploadManager.cs |  2 +-
 ShareX/WorkerTask.cs    |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ShareX/TaskInfo.cs b/ShareX/TaskInfo.cs
index 36f4b3581..925f41927 100644
--- a/ShareX/TaskInfo.cs
+++ b/ShareX/TaskInfo.cs
@@ -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;
             }
         }
 
diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs
index 5fea3cf35..c96a85838 100644
--- a/ShareX/UploadManager.cs
+++ b/ShareX/UploadManager.cs
@@ -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)
                 {
diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs
index eb44e60b4..8cf0725bf 100644
--- a/ShareX/WorkerTask.cs
+++ b/ShareX/WorkerTask.cs
@@ -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)
                 {