Skip to content

Portable Tool for an Ideal Windows Setup

fix correcting the early termination of the method

Greedeks526fb5a766de
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 9d5e2b4a..2856d23e 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -98,8 +98,8 @@
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Design" />
- <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.7, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.9.0.7\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+ <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.8, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.9.0.8\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -117,11 +117,6 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
- <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
- <Private>True</Private>
- <Private>True</Private>
- </Reference>
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
diff --git a/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs b/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs
index 57262ce6..a097f78c 100644
--- a/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs
+++ b/.Source/GTweak/Utilities/Managers/TaskSchedulerManager.cs
@@ -16,19 +16,20 @@ namespace GTweak.Utilities.Managers
{
string[] existingTasks = GetExistingTasks(tasklist);
- if (existingTasks.Length == 0)
- return false;
-
- byte numberRunningTask = 0;
- using (Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService())
+ if (existingTasks.Length != 0)
{
- numberRunningTask += (byte)(from string taskname in existingTasks
- let task = taskService.GetTask(taskname)
- where task != null
- where task.Enabled
- select taskname).Count();
+ byte numberRunningTask = 0;
+ using (Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService())
+ {
+ numberRunningTask += (byte)(from string taskname in existingTasks
+ let task = taskService.GetTask(taskname)
+ where task != null
+ where task.Enabled
+ select taskname).Count();
+ }
+ return numberRunningTask > 0;
}
- return numberRunningTask > 0;
+ return false;
}
internal static void SetTaskState(bool state, params string[] tasklist)
@@ -37,17 +38,17 @@ namespace GTweak.Utilities.Managers
{
string[] existingTasks = GetExistingTasks(tasklist);
- if (existingTasks.Length == 0)
- return;
-
- using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();
- foreach (string taskname in existingTasks)
+ if (existingTasks.Length != 0)
{
- using Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);
- if (task != null && task.Enabled != state)
+ using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();
+ foreach (string taskname in existingTasks)
{
- task.Definition.Settings.Enabled = state;
- task.RegisterChanges();
+ using Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);
+ if (task != null && task.Enabled != state)
+ {
+ task.Definition.Settings.Enabled = state;
+ task.RegisterChanges();
+ }
}
}
});
@@ -59,15 +60,15 @@ namespace GTweak.Utilities.Managers
{
string[] existingTasks = GetExistingTasks(tasklist);
- if (existingTasks.Length == 0)
- return;
-
- StringBuilder sb = new StringBuilder();
- foreach (string task in existingTasks)
- sb.Append($"schtasks /change {(state ? "/enable" : "/disable")} /tn \"{task}\" & ");
- string tasksCommand = sb.ToString().TrimEnd(' ', '&');
+ if (existingTasks.Length != 0)
+ {
+ StringBuilder sb = new StringBuilder();
+ foreach (string task in existingTasks)
+ sb.Append($"schtasks /change {(state ? "/enable" : "/disable")} /tn \"{task}\" & ");
+ string tasksCommand = sb.ToString().TrimEnd(' ', '&');
- CommandExecutor.RunCommandAsTrustedInstaller($"/c {tasksCommand}");
+ CommandExecutor.RunCommandAsTrustedInstaller($"/c {tasksCommand}");
+ }
});
}
@@ -78,15 +79,15 @@ namespace GTweak.Utilities.Managers
{
string[] existingTasks = GetExistingTasks(tasklist);
- if (existingTasks.Length == 0)
- return;
-
- using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();
- foreach (string taskname in existingTasks)
+ if (existingTasks.Length != 0)
{
- Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);
- if (task != null)
- taskService.RootFolder.DeleteTask(taskname);
+ using Microsoft.Win32.TaskScheduler.TaskService taskService = new Microsoft.Win32.TaskScheduler.TaskService();
+ foreach (string taskname in existingTasks)
+ {
+ Microsoft.Win32.TaskScheduler.Task task = taskService.GetTask(taskname);
+ if (task != null)
+ taskService.RootFolder.DeleteTask(taskname);
+ }
}
});
}
diff --git a/.Source/GTweak/packages.config b/.Source/GTweak/packages.config
index 92c824aa..2cdae4ff 100644
--- a/.Source/GTweak/packages.config
+++ b/.Source/GTweak/packages.config
@@ -13,13 +13,12 @@
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
<package id="System.Console" version="4.3.1" targetFramework="net48" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
- <package id="System.Diagnostics.DiagnosticSource" version="9.0.7" targetFramework="net48" />
+ <package id="System.Diagnostics.DiagnosticSource" version="9.0.8" targetFramework="net48" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
<package id="System.Globalization" version="4.3.0" targetFramework="net48" />
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net48" />
<package id="System.IO" version="4.3.0" targetFramework="net48" />
- <package id="System.IO.Compression" version="4.3.0" targetFramework="net48" />
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net48" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net48" />