Browse Source

Formatting

pull/99/head
DaNike 1 year ago
parent
commit
dd00c7442b
No known key found for this signature in database GPG Key ID: 40F6F33603F1772D
3 changed files with 6 additions and 2 deletions
  1. +1
    -0
      IPA.Loader/Config/Stores/GeneratedStoreImpl/Correction.cs
  2. +1
    -0
      IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs
  3. +4
    -2
      IPA.Loader/Loader/PluginManager.cs

+ 1
- 0
IPA.Loader/Config/Stores/GeneratedStoreImpl/Correction.cs View File

@ -46,6 +46,7 @@ namespace IPA.Config.Stores
var endLabel = il.DefineLabel(); var endLabel = il.DefineLabel();
// TODO: when we have a nullable, we need to save to a local to call methods
if (member.IsNullable) if (member.IsNullable)
{ {
il.Emit(OpCodes.Dup); il.Emit(OpCodes.Dup);


+ 1
- 0
IPA.Loader/Config/Stores/GeneratedStoreImpl/Deserialization.cs View File

@ -112,6 +112,7 @@ namespace IPA.Config.Stores
{ {
il.Emit(OpCodes.Stloc, mapLocal); il.Emit(OpCodes.Stloc, mapLocal);
// TODO: handle creating a nullable, when applicable
EmitLoad(il, member, thisarg); EmitLoad(il, member, thisarg);
il.Emit(OpCodes.Stloc, resultLocal); il.Emit(OpCodes.Stloc, resultLocal);


+ 4
- 2
IPA.Loader/Loader/PluginManager.cs View File

@ -199,7 +199,8 @@ namespace IPA.Loader
var res = TaskEx.WhenAll(exec.Dependents.Select(d => Disable(d, alreadyDisabled))) var res = TaskEx.WhenAll(exec.Dependents.Select(d => Disable(d, alreadyDisabled)))
.ContinueWith(t => .ContinueWith(t =>
{ {
if (t.IsFaulted) {
if (t.IsFaulted)
{
return TaskEx.WhenAll(t, TaskEx6.FromException( return TaskEx.WhenAll(t, TaskEx6.FromException(
new CannotRuntimeDisableException(exec.Executor.Metadata, "Dependents cannot be disabled for plugin"))); new CannotRuntimeDisableException(exec.Executor.Metadata, "Dependents cannot be disabled for plugin")));
} }
@ -208,7 +209,8 @@ namespace IPA.Loader
{ {
foreach (var feature in exec.Executor.Metadata.Features) foreach (var feature in exec.Executor.Metadata.Features)
{ {
try {
try
{
feature.AfterDisable(exec.Executor.Metadata); feature.AfterDisable(exec.Executor.Metadata);
} }
catch (Exception e) catch (Exception e)


Loading…
Cancel
Save