diff --git a/Quest2-VRC.Core/Modules/ADB.cs b/Quest2-VRC.Core/Modules/ADB.cs index b29b04d..0dbf089 100644 --- a/Quest2-VRC.Core/Modules/ADB.cs +++ b/Quest2-VRC.Core/Modules/ADB.cs @@ -45,6 +45,8 @@ Quest 1 (Android 10) = monterey Quest Pro = seacliff Quest 3 = eureka Quest3S = panther */ + Quest 3 = eureka + Quest3S = panther */ { Console.WriteLine("Device is: \nModel: {0}\nCodename: {1} \nState: {2}", device.Model, device.Name, device.State); Console.WriteLine("Oculus/Meta device is not detected or is not authorized, please disconnect all non Oculus/Meta devices and close all emulators on PC, try again"); @@ -229,13 +231,21 @@ public static void StartADBSrv() } + public static void StopADB() public static void StopADB() + { + if (!AdbServer.Instance.GetStatus().IsRunning == false) + { + try { if (!AdbServer.Instance.GetStatus().IsRunning == false) { try + { + ToastNotificationManagerCompat.History.Clear(); + ToastNotificationManagerCompat.Uninstall(); { ToastNotificationManagerCompat.History.Clear(); ToastNotificationManagerCompat.Uninstall(); @@ -247,6 +257,13 @@ public static void StopADB() { // IDK how this works } + ForceKillADB(); + Environment.Exit(1987); + } + catch + { + // IDK how this works + } } else @@ -255,8 +272,17 @@ public static void StopADB() ToastNotificationManagerCompat.Uninstall(); Environment.Exit(1987); } + } + else + { + ToastNotificationManagerCompat.History.Clear(); + ToastNotificationManagerCompat.Uninstall(); + Environment.Exit(1987); + } } + } + }