AfterCaptureJobsTemp fixes

This commit is contained in:
mcored 2014-05-11 17:45:15 +08:00
parent 9a116c9eaf
commit 315db11ba0
3 changed files with 4 additions and 3 deletions

View file

@ -236,13 +236,13 @@ await TaskEx.Run(() =>
if (!string.IsNullOrEmpty(path) && File.Exists(path))
{
if (TaskSettings.SafeAfterTasks.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost))
if (TaskSettings.SafeAfterTasks.AfterCaptureJobsTemp.HasFlag(AfterCaptureTasks.UploadImageToHost))
{
UploadManager.UploadFile(path, TaskSettings);
}
else
{
if (TaskSettings.SafeAfterTasks.AfterCaptureJob.HasFlag(AfterCaptureTasks.CopyFilePathToClipboard))
if (TaskSettings.SafeAfterTasks.AfterCaptureJobsTemp.HasFlag(AfterCaptureTasks.CopyFilePathToClipboard))
{
ClipboardHelpers.CopyText(path);
}

View file

@ -43,7 +43,7 @@ public bool IsUploadJob
{
get
{
return Job != TaskJob.ImageJob || TaskSettings.SafeAfterTasks.AfterCaptureJob.HasFlag(AfterCaptureTasks.UploadImageToHost);
return Job != TaskJob.ImageJob || TaskSettings.SafeAfterTasks.AfterCaptureJobsTemp.HasFlag(AfterCaptureTasks.UploadImageToHost);
}
}

View file

@ -209,6 +209,7 @@ public static TaskSettings GetSafeTaskSettings(TaskSettings taskSettings)
{
if (taskSettings.IsUsingDefaultSettings && Program.DefaultTaskSettings != null)
{
Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJobsTemp = Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJob;
return Program.DefaultTaskSettings;
}
else