ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-25 09:59:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'apiX' of github.com:goatcorp/Dalamud into apiX

Browse source
This commit is contained in:
goat 2024-07-01 20:15:07 +02:00
commit 0f5cf33fdd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dalamud/Plugin/Internal/PluginManager.cs
View file

@ -554,14 +554,14 @@ internal class PluginManager : IInternalDisposableService
var manifestFile = LocalPluginManifest.GetManifestFile(dllFile); var manifestFile = LocalPluginManifest.GetManifestFile(dllFile);
if (!manifestFile.Exists) if (!manifestFile.Exists)
{ {
Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
continue; continue;
} }
var manifest = LocalPluginManifest.Load(manifestFile); var manifest = LocalPluginManifest.Load(manifestFile);
if (manifest == null) if (manifest == null)
{ {
Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
continue; continue;
} }
@ -816,14 +816,14 @@ internal class PluginManager : IInternalDisposableService
var manifestFile = LocalPluginManifest.GetManifestFile(dllFile); var manifestFile = LocalPluginManifest.GetManifestFile(dllFile);
if (!manifestFile.Exists) if (!manifestFile.Exists)
{ {
Log.Information("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName); Log.Error("DLL at {DllPath} has no manifest, this is no longer valid", dllFile.FullName);
continue; continue;
} }
var manifest = LocalPluginManifest.Load(manifestFile); var manifest = LocalPluginManifest.Load(manifestFile);
if (manifest == null) if (manifest == null)
{ {
Log.Information("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName); Log.Error("Could not deserialize manifest for DLL at {DllPath}", dllFile.FullName);
continue; continue;
} }

2
lib/FFXIVClientStructs

@ -1 +1 @@
Subproject commit 31afa02c8f423ad57a28fd6b9109e8da348ce528 Subproject commit 15dcf7cfcea43f658f6309b7649db72e30f4f017