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

fix: load/unload plugins after framework

Browse source
This commit is contained in:
goat 2020-01-13 23:16:01 +09:00
parent 2ea44f626a
commit b418a6dc0f
1 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Dalamud/Dalamud.cs
View file

@ -87,20 +87,23 @@ namespace Dalamud {
this.InterfaceManager = new InterfaceManager(this.sigScanner); this.InterfaceManager = new InterfaceManager(this.sigScanner);
this.InterfaceManager.OnDraw += BuildDalamudUi; this.InterfaceManager.OnDraw += BuildDalamudUi;
this.InterfaceManager.Enable(); this.InterfaceManager.Enable();
try {
this.PluginManager.LoadPlugins();
} catch (Exception ex) {
Framework.Gui.Chat.PrintError(
"[XIVLAUNCHER] There was an error loading additional plugins. Please check the log for more details.");
Log.Error(ex, "Plugin load failed.");
}
} }
public void Start() { public void Start() {
Framework.Enable(); Framework.Enable();
this.BotManager.Start(); this.BotManager.Start();
try
{
this.PluginManager.LoadPlugins();
}
catch (Exception ex)
{
Framework.Gui.Chat.PrintError(
"[XIVLAUNCHER] There was an error loading additional plugins. Please check the log for more details.");
Log.Error(ex, "Plugin load failed.");
}
} }
public void Unload() { public void Unload() {
@ -112,6 +115,17 @@ namespace Dalamud {
} }
public void Dispose() { public void Dispose() {
try
{
this.PluginManager.UnloadPlugins();
}
catch (Exception ex)
{
Framework.Gui.Chat.PrintError(
"[XIVLAUNCHER] There was an error unloading additional plugins. Please check the log for more details.");
Log.Error(ex, "Plugin unload failed.");
}
this.InterfaceManager.Dispose(); this.InterfaceManager.Dispose();
Framework.Dispose(); Framework.Dispose();
@ -146,30 +160,38 @@ namespace Dalamud {
{ {
if (ImGui.BeginMainMenuBar()) if (ImGui.BeginMainMenuBar())
{ {
if (ImGui.BeginMenu("Dalamud DEBUG")) if (ImGui.BeginMenu("Dalamud"))
{ {
ImGui.MenuItem("Draw Dalamud dev menu", "", ref this.isImguiDrawDevMenu); ImGui.MenuItem("Draw Dalamud dev menu", "", ref this.isImguiDrawDevMenu);
if (ImGui.MenuItem("Open Log window")) if (ImGui.MenuItem("Open Log window"))
{ {
this.logWindow = new DalamudLogWindow(); this.logWindow = new DalamudLogWindow();
this.isImguiDrawLogWindow = true; this.isImguiDrawLogWindow = true;
} }
ImGui.MenuItem("Draw ImGui demo", "", ref this.isImguiDrawDemoWindow); ImGui.MenuItem("Draw ImGui demo", "", ref this.isImguiDrawDemoWindow);
ImGui.Separator(); ImGui.Separator();
if (ImGui.MenuItem("Unload Dalamud")) if (ImGui.MenuItem("Unload Dalamud"))
{ {
Unload(); Unload();
} }
if (ImGui.MenuItem("Kill game")) if (ImGui.MenuItem("Kill game"))
{ {
Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
} }
ImGui.EndMenu();
} }
if (ImGui.BeginMenu("Plugins"))
{
if (ImGui.MenuItem("Reload plugins"))
{
OnPluginReloadCommand(string.Empty, string.Empty);
}
ImGui.EndMenu();
}
//ImGui.EndMainMenuBar();
} }
} }