Skip to content

Commit 52140d9

Browse files
committed
Remove CancelToken
1 parent 89bb98c commit 52140d9

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

DiffCreator/obj/Release/net6.0/DiffCreator.AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[assembly: System.Reflection.AssemblyCompanyAttribute("DiffCreator")]
1515
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
1616
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
17-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a7e38eb39f068612272f220c93ff04601cfeb33e")]
17+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+89bb98ca8057398c94294c6f2e242f66e4cc4474")]
1818
[assembly: System.Reflection.AssemblyProductAttribute("DiffCreator")]
1919
[assembly: System.Reflection.AssemblyTitleAttribute("DiffCreator")]
2020
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a0f28e8274c2ffadbf476424324d476fdc6c89d144099da1aee85cbadcadff50
1+
4f2ba37ec6b5007fb2c1f4e017836611f5436a71d45c35bc180eb41305eba239

QuestAppVersionSwitcher/Adb/AdbServer.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class AdbServer : IDisposable
1717
private static string? FilesDir => AndroidCore.context?.FilesDir?.Path;
1818
private static string? CacheDir => AndroidCore.context?.CacheDir?.Path;
1919
private static string? NativeLibsDir => AndroidCore.context.ApplicationInfo?.NativeLibraryDir;
20-
private CancellationTokenSource? CancelToken { get; set; }
2120
private Process? ServerProcess { get; set; }
2221
public static AdbServer Instance { get; set; }
2322

@@ -43,10 +42,6 @@ private void StartServer(string arguments)
4342
{
4443
Thread t = new Thread(() =>
4544
{
46-
// Asserts
47-
Debug.Assert(this.ServerProcess == null);
48-
Debug.Assert(this.CancelToken == null);
49-
5045
// Create and configure the ProcessStartInfo.
5146
var adbInfo = new ProcessStartInfo(AdbPath, arguments);
5247
adbInfo.WorkingDirectory = FilesDir;
@@ -64,10 +59,7 @@ private void StartServer(string arguments)
6459
{
6560
Logger.Log("Adb server failed to start", LoggingType.Error);
6661
}
67-
68-
// Dispose any token source that may exist (there shouldn't be any)
69-
CancelToken?.Dispose();
70-
62+
7163
// Wait for the server to exit
7264
while (!ServerProcess.StandardError.EndOfStream)
7365
{
@@ -107,9 +99,6 @@ private void DisposeVariables(bool attemptKill)
10799
// Cleanup the token and process
108100
ServerProcess?.Dispose();
109101
ServerProcess = null;
110-
111-
CancelToken?.Dispose();
112-
CancelToken = null;
113102
}
114103

115104
/// <summary>

0 commit comments

Comments
 (0)