From 2fef407ce3d587d7e73922e6a402ad4638d76949 Mon Sep 17 00:00:00 2001
From: Andy Baker <andy@andybak.net>
Date: Fri, 26 Apr 2024 16:03:18 +0100
Subject: [PATCH] De-initialize XR Subsytems properly (#695)

* Correctly de-init xr subsystems

* Update Rider plugin
---
 Assets/Scripts/VrSdk.cs     | 2 ++
 Packages/manifest.json      | 2 +-
 Packages/packages-lock.json | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/VrSdk.cs b/Assets/Scripts/VrSdk.cs
index a4158e3a7c..cce18a50c7 100644
--- a/Assets/Scripts/VrSdk.cs
+++ b/Assets/Scripts/VrSdk.cs
@@ -273,6 +273,8 @@ void OnDestroy()
                 Application.onBeforeRender -= OnNewPoses;
                 InputDevices.deviceConnected -= OnUnityXRDeviceConnected;
                 InputDevices.deviceDisconnected -= OnUnityXRDeviceDisconnected;
+                XRGeneralSettings.Instance?.Manager?.StopSubsystems();
+                XRGeneralSettings.Instance?.Manager?.DeinitializeLoader();
             }
         }
 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 207eda9685..3c0bd090ae 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.cloud.gltfast": "6.0.1",
     "com.unity.editorcoroutines": "1.0.0",
     "com.unity.formats.usd": "1.0.3-preview.2",
-    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.rider": "3.0.28",
     "com.unity.ide.visualstudio": "2.0.20",
     "com.unity.inputsystem": "https://github.com/icosa-mirror/com.unity.inputsystem.git#open-brush",
     "com.unity.localization": "1.4.2",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index f5647b1abd..2ea2729747 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -101,7 +101,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.24",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {