Merge branch 'dev'

Author: VolcanicArts

Directory.Build.props

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <GlobalVersionYear>$([System.DateTime]::Now.ToString("yyyy"))</GlobalVersionYear>
         <GlobalVersionMonthDay>$([System.DateTime]::Now.ToString("Mdd"))</GlobalVersionMonthDay>
-        <GlobalBuild>2</GlobalBuild>
+        <GlobalBuild>3</GlobalBuild>
         <GlobalVersion>$(GlobalVersionYear).$(GlobalVersionMonthDay).$(GlobalBuild).0</GlobalVersion>
     </PropertyGroup>
 </Project>

VRCOSC.App/SDK/Modules/Module.cs

@@ -82,7 +82,7 @@ public abstract class Module
     private SerialisationManager moduleSerialisationManager = null!;
     private SerialisationManager persistenceSerialisationManager = null!;
 
-    internal IManagedWindow? SettingsWindow { get; private set; }
+    internal Type? SettingsWindowType { get; private set; }
     internal Type? RuntimeViewType { get; private set; }
 
     private bool isLoaded;
@@ -163,9 +163,7 @@ private void setSettingsWindow()
         if (!windowType.IsAssignableTo(typeof(IManagedWindow))) throw new Exception("Cannot set settings window that doesn't extend IManagedWindow");
         if (!windowType.HasConstructorThatAccepts(GetType())) throw new Exception($"Cannot set settings window that doesn't have a constructor that accepts type {GetType().Name}");
 
-        var window = (Window)Activator.CreateInstance(windowType, this)!;
-        window.Closing += (_, _) => Serialise();
-        SettingsWindow = (IManagedWindow)window;
+        SettingsWindowType = windowType;
     }
 
     #endregion

VRCOSC.App/UI/Views/Modules/ModulesView.xaml.cs

@@ -1,6 +1,7 @@
 // Copyright (c) VolcanicArts. Licensed under the GPL-3.0 License.
 // See the LICENSE file in the repository root for full license text.
 
+using System;
 using System.Windows;
 using VRCOSC.App.Modules;
 using VRCOSC.App.Profiles;
@@ -64,7 +65,16 @@ private void SettingsButton_OnClick(object sender, RoutedEventArgs e)
         var element = (FrameworkElement)sender;
         var module = (Module)element.Tag;
 
-        settingsWindowManager.TrySpawnChild(module.SettingsWindow ?? new ModuleSettingsWindow(module));
+        if (module.SettingsWindowType is not null)
+        {
+            var window = (Window)Activator.CreateInstance(module.SettingsWindowType, module)!;
+            window.Closing += (_, _) => module.Serialise();
+            settingsWindowManager.TrySpawnChild((IManagedWindow)window);
+        }
+        else
+        {
+            settingsWindowManager.TrySpawnChild(new ModuleSettingsWindow(module));
+        }
     }
 
     private void InfoButton_OnClick(object sender, RoutedEventArgs e)