ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-18 22:07:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: correctly dispose dalamud when closing the game

Browse source
This commit is contained in:
goat 2021-01-17 22:13:23 +01:00
parent 094099c570
commit 05f8adfaf9
4 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/Dalamud.cs
View file

@ -143,6 +143,8 @@ namespace Dalamud {
private readonly ManualResetEvent unloadSignal;
private readonly ManualResetEvent finishUnloadSignal;
private readonly string baseDirectory;
#endregion
@ -162,13 +164,14 @@ namespace Dalamud {
/// </summary>
internal DirectoryInfo AssetDirectory => new DirectoryInfo(this.StartInfo.AssetDirectory);
public Dalamud(DalamudStartInfo info, LoggingLevelSwitch loggingLevelSwitch) {
public Dalamud(DalamudStartInfo info, LoggingLevelSwitch loggingLevelSwitch, ManualResetEvent finishSignal) {
this.StartInfo = info;
this.LogLevelSwitch = loggingLevelSwitch;
this.baseDirectory = info.WorkingDirectory;
this.unloadSignal = new ManualResetEvent(false);
this.finishUnloadSignal = finishSignal;
this.Configuration = DalamudConfiguration.Load(info.ConfigurationPath);
@ -277,6 +280,10 @@ namespace Dalamud {
this.unloadSignal.WaitOne();
}
public void WaitForUnloadFinish() {
this.finishUnloadSignal.WaitOne();
}
public void Dispose() {
// this must be done before unloading plugins, or it can cause a race condition
// due to rendering happening on another thread, where a plugin might receive
@ -305,6 +312,8 @@ namespace Dalamud {
this.Data.Dispose();
this.AntiDebug?.Dispose();
Log.Debug("Dalamud::Dispose OK!");
}
internal void ReplaceExceptionHandler() {