ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-13 12:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bugfix for service creation stalling itself.

Browse source
This commit is contained in:
Ottermandias 2023-04-19 11:00:53 +02:00
parent e3c333dd22
commit 1364b39f65
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra.GameData/Data/ObjectIdentification.cs
View file

@ -29,7 +29,6 @@ internal sealed class ObjectIdentification : DataSharer, IObjectIdentifier
public readonly IReadOnlyDictionary<string, IReadOnlyList<Action>> Actions; public readonly IReadOnlyDictionary<string, IReadOnlyList<Action>> Actions;
private readonly ActorManager.ActorManagerData _actorData; private readonly ActorManager.ActorManagerData _actorData;
private readonly EquipmentIdentificationList _equipment; private readonly EquipmentIdentificationList _equipment;
private readonly WeaponIdentificationList _weapons; private readonly WeaponIdentificationList _weapons;
private readonly ModelIdentificationList _modelIdentifierToModelChara; private readonly ModelIdentificationList _modelIdentifierToModelChara;

13
Penumbra/Services/ServiceWrapper.cs
View file

@ -78,9 +78,14 @@ public abstract class AsyncServiceWrapper<T> : IServiceWrapper<T>
{ {
Service = service; Service = service;
Penumbra.Log.Verbose($"[{Name}] Created."); Penumbra.Log.Verbose($"[{Name}] Created.");
FinishedCreation?.Invoke(); _task = null;
} }
}); });
_task.ContinueWith((t, x) =>
{
if (!_isDisposed)
FinishedCreation?.Invoke();
}, null);
} }
protected AsyncServiceWrapper(string name, Func<T> factory) protected AsyncServiceWrapper(string name, Func<T> factory)
@ -99,9 +104,13 @@ public abstract class AsyncServiceWrapper<T> : IServiceWrapper<T>
Service = service; Service = service;
Penumbra.Log.Verbose($"[{Name}] Created."); Penumbra.Log.Verbose($"[{Name}] Created.");
_task = null; _task = null;
FinishedCreation?.Invoke();
} }
}); });
_task.ContinueWith((t, x) =>
{
if (!_isDisposed)
FinishedCreation?.Invoke();
}, null);
} }
public void Dispose() public void Dispose()