ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 06:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into sestring_payloads_refactor

Browse source
This commit is contained in:
meli 2020-04-26 13:47:36 -07:00
commit c8938622a5
7 changed files with 97 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Dalamud.cs
View file

@ -23,6 +23,7 @@ using Dalamud.Game.Network;
using Dalamud.Interface;
using Dalamud.Plugin;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;
using Newtonsoft.Json;
using Serilog;
using Serilog.Core;
@ -93,6 +94,10 @@ namespace Dalamud {
this.WinSock2 = new WinSockHandlers();
AssetManager.EnsureAssets(this.baseDirectory).ContinueWith(async task => {
if (task.IsCanceled || task.IsFaulted) {
throw new Exception("Could not ensure assets.", task.Exception);
}
this.localizationMgr = new Localization(this.StartInfo.WorkingDirectory);
if (!string.IsNullOrEmpty(this.Configuration.LanguageOverride)) {
this.localizationMgr.SetupWithLangCode(this.Configuration.LanguageOverride);