Allow VRCOSC to close with SteamVR

Author: VolcanicArts

VRCOSC.Game/Config/VRCOSCConfigManager.cs

@@ -28,6 +28,7 @@ protected override void InitialiseDefaults()
         SetDefault(VRCOSCSetting.UpdateRepo, @"https://github.com/VolcanicArts/VRCOSC");
         SetDefault(VRCOSCSetting.Theme, ColourTheme.Dark);
         SetDefault(VRCOSCSetting.ChatBoxTimeSpan, 1500);
+        SetDefault(VRCOSCSetting.AutoStopOpenVR, false);
     }
 }
 
@@ -41,5 +42,6 @@ public enum VRCOSCSetting
     UpdateMode,
     UpdateRepo,
     Theme,
-    ChatBoxTimeSpan
+    ChatBoxTimeSpan,
+    AutoStopOpenVR
 }

VRCOSC.Game/Graphics/Settings/AutomationSection.cs

@@ -0,0 +1,17 @@
+// Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
+// See the LICENSE file in the repository root for full license text.
+
+using VRCOSC.Game.Config;
+
+namespace VRCOSC.Game.Graphics.Settings;
+
+public sealed partial class AutomationSection : SectionContainer
+{
+    protected override string Title => "Automation";
+
+    protected override void GenerateItems()
+    {
+        AddToggle("Start/Stop with VRChat", "Auto start/stop modules on VRChat start/stop", ConfigManager.GetBindable<bool>(VRCOSCSetting.AutoStartStop));
+        AddToggle("Close with SteamVR", "Should VRCOSC close when SteamVR closes?", ConfigManager.GetBindable<bool>(VRCOSCSetting.AutoStopOpenVR));
+    }
+}

VRCOSC.Game/Graphics/Settings/ModulesSection.cs

@@ -55,7 +55,7 @@ public SettingsScreen()
                             {
                                 new GeneralSection(),
                                 new OscSection(),
-                                new ModulesSection(),
+                                new AutomationSection(),
                                 new UpdateSection()
                             }
                         }

VRCOSC.Game/Graphics/Settings/SettingsScreen.cs

@@ -32,6 +32,7 @@ public class OpenVRInterface
 
     private readonly Storage storage;
     public bool HasInitialised { get; private set; }
+    public Action? OnOpenVRShutdown;
 
     public OpenVRInterface(Storage storage)
     {
@@ -127,6 +128,7 @@ public void Update()
                 OpenVR.System.AcknowledgeQuit_Exiting();
                 OpenVR.Shutdown();
                 HasInitialised = false;
+                OnOpenVRShutdown?.Invoke();
                 return;
             }
         }

VRCOSC.Game/Modules/OpenVRInterface.cs

@@ -94,6 +94,11 @@ protected override void LoadComplete()
         {
             if (e.NewValue == GameManagerState.Starting) SelectedTab.Value = Tab.Modules;
         }, true);
+
+        gameManager.OpenVRInterface.OnOpenVRShutdown += () =>
+        {
+            if (ConfigManager.Get<bool>(VRCOSCSetting.AutoStopOpenVR)) prepareForExit();
+        };
     }
 
     private void checkUpdates()