fix

goatcorp · Dec 17, 2023 · e25ee19 · e25ee19
1 parent 077eae7
commit e25ee19
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs b/Dalamud/Interface/Internal/ImGuiClipboardFunctionProvider.cs
@@ -63,7 +63,7 @@ private ImGuiClipboardFunctionProvider(InterfaceManager.InterfaceManagerWithScen
         io.SetClipboardTextFn = (nint)(delegate* unmanaged<nint, byte*, void>)&StaticSetClipboardTextImpl;
         io.GetClipboardTextFn = (nint)(delegate* unmanaged<nint, byte*>)&StaticGetClipboardTextImpl;
 
-        this.clipboardData = new(0, 0);
+        this.clipboardData = new(0, null);
         return;
 
         [UnmanagedCallersOnly]

diff --git a/Dalamud/Interface/Utility/ImVectorWrapper.cs b/Dalamud/Interface/Utility/ImVectorWrapper.cs
@@ -251,7 +251,7 @@ public ImVectorWrapper(ref ImVector vector, delegate*<T*, void> destroyer = null
     /// </summary>
     /// <param name="initialCapacity">The initial capacity.</param>
     /// <param name="destroyer">The destroyer function to call on item removal.</param>
-    public ImVectorWrapper(int initialCapacity = 0, delegate*<T*, void> destroyer = null)
+    public ImVectorWrapper(int initialCapacity, delegate*<T*, void> destroyer = null)
     {
         if (initialCapacity < 0)
         {
@@ -292,7 +292,7 @@ public ImVectorWrapper(int initialCapacity = 0, delegate*<T*, void> destroyer =
     /// <param name="destroyer">The destoryer function.</param>
     public ImVectorWrapper(
         int capacity,
-        int initialLength = 0,
+        int initialLength,
         T* backingStorage = null,
         ImVector* vectorStorage = null,
         delegate*<T*, void> destroyer = null)

diff --git a/Dalamud/Plugin/Internal/Types/LocalPlugin.cs b/Dalamud/Plugin/Internal/Types/LocalPlugin.cs
@@ -626,6 +626,19 @@ private static void SetupLoaderConfig(LoaderConfig config)
         config.PreferSharedTypes = false;
         config.SharedAssemblies.Add(typeof(Lumina.GameData).Assembly.GetName());
         config.SharedAssemblies.Add(typeof(Lumina.Excel.ExcelSheetImpl).Assembly.GetName());
+
+        AppDomain.CurrentDomain.AssemblyResolve += (_, args) =>
+        {
+            try
+            {
+                return Assembly.Load(args.Name);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e, "AssemblyResolve fail");
+                return null;
+            }
+        };
     }
 
     private void EnsureLoader()