CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Revert "If system admin disabled upload then on first run disable after capture upload option"

Browse source 
This reverts commit 0887008f4f.
This commit is contained in:
Jaex 2022-08-31 13:02:56 +03:00
parent 0887008f4f
commit cabaaac3b8
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ShareX/SettingManager.cs
View file

@ -189,26 +189,8 @@ public static void LoadAllSettings()
LoadHotkeysConfig(); LoadHotkeysConfig();
} }
public static void DisableAfterCaptureUpload()
{
DefaultTaskSettings.AfterCaptureJob = DefaultTaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
foreach (HotkeySettings hotkeySettings in HotkeysConfig.Hotkeys)
{
if (hotkeySettings.TaskSettings != null)
{
hotkeySettings.TaskSettings.AfterCaptureJob = hotkeySettings.TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
}
}
}
private static void ApplicationConfigBackwardCompatibilityTasks() private static void ApplicationConfigBackwardCompatibilityTasks()
{ {
if (Settings.IsFirstTimeRun && SystemOptions.DisableUpload)
{
DisableAfterCaptureUpload();
}
if (Settings.IsUpgradeFrom("13.0.2")) if (Settings.IsUpgradeFrom("13.0.2"))
{ {
Settings.UseCustomTheme = Settings.UseDarkTheme; Settings.UseCustomTheme = Settings.UseDarkTheme;

10
ShareX/WorkerTask.cs
View file

@ -377,7 +377,15 @@ private void DoUploadJob()
if (disableUpload) if (disableUpload)
{ {
SettingManager.DisableAfterCaptureUpload(); Program.DefaultTaskSettings.AfterCaptureJob = Program.DefaultTaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
foreach (HotkeySettings hotkeySettings in Program.HotkeysConfig.Hotkeys)
{
if (hotkeySettings.TaskSettings != null)
{
hotkeySettings.TaskSettings.AfterCaptureJob = hotkeySettings.TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
}
}
Info.TaskSettings.AfterCaptureJob = Info.TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost); Info.TaskSettings.AfterCaptureJob = Info.TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
Info.Result.IsURLExpected = false; Info.Result.IsURLExpected = false;