From a1b978a22c38868b2a64a7261493d8b03a2bd705 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Sun, 21 Mar 2021 03:31:55 +0800 Subject: [PATCH] Remove WindowsJobAPI --- Netch/Controllers/HTTPController.cs | 1 - Netch/Controllers/MainController.cs | 9 --------- Netch/Global.cs | 6 ------ Netch/Netch.csproj | 1 - 4 files changed, 17 deletions(-) diff --git a/Netch/Controllers/HTTPController.cs b/Netch/Controllers/HTTPController.cs index 248ca857..fa08bd2c 100644 --- a/Netch/Controllers/HTTPController.cs +++ b/Netch/Controllers/HTTPController.cs @@ -24,7 +24,6 @@ namespace Netch.Controllers public void Start(in Mode mode) { PrivoxyController.Start(MainController.Server!); - Global.Job.AddProcess(PrivoxyController.Instance!); string? pacUrl = null; if (MainController.Server is Socks5 or Trojan && mode.BypassChina || (Global.Settings.AlwaysStartPACServer ?? false)) diff --git a/Netch/Controllers/MainController.cs b/Netch/Controllers/MainController.cs index b5fe036f..1a20723d 100644 --- a/Netch/Controllers/MainController.cs +++ b/Netch/Controllers/MainController.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics; using System.IO; -using System.Threading; using System.Threading.Tasks; using Netch.Models; using Netch.Servers.Socks5; @@ -110,12 +109,6 @@ namespace Netch.Controllers Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", controller.Name)); controller.Start(in server, mode); - if (controller is Guard {Instance: { }} guard) - Task.Run(() => - { - Thread.Sleep(1000); - Global.Job.AddProcess(guard.Instance!); - }); if (server is Socks5 socks5) { @@ -141,8 +134,6 @@ namespace Netch.Controllers Global.MainForm.StatusText(i18N.TranslateFormat("Starting {0}", ModeController.Name)); ModeController.Start(mode); - if (ModeController is Guard {Instance: { }} guard) - Global.Job.AddProcess(guard.Instance!); } public static async Task StopAsync() diff --git a/Netch/Global.cs b/Netch/Global.cs index 7dc496d2..ac594a2f 100644 --- a/Netch/Global.cs +++ b/Netch/Global.cs @@ -4,7 +4,6 @@ using System.Text.Encodings.Web; using System.Text.Json; using System.Threading; using System.Windows.Forms; -using WindowsJobAPI; using Netch.Controllers; using Netch.Forms; using Netch.Models; @@ -44,11 +43,6 @@ namespace Netch /// public static readonly List Modes = new(); - /// - /// Windows Job API - /// - public static readonly JobObject Job = new(); - public static class Flags { public static readonly bool IsWindows10Upper = Environment.OSVersion.Version.Major >= 10; diff --git a/Netch/Netch.csproj b/Netch/Netch.csproj index eb88e6eb..34c1d1c5 100644 --- a/Netch/Netch.csproj +++ b/Netch/Netch.csproj @@ -58,7 +58,6 @@ -