Fix troubleshooting after rebase

This commit is contained in:
Raymond 2021-08-21 14:05:13 -04:00
parent 2fe8ccb1da
commit f503d4955a

View file

@ -47,27 +47,25 @@ namespace Dalamud
/// <summary> /// <summary>
/// Log troubleshooting information in a parseable format to Serilog. /// Log troubleshooting information in a parseable format to Serilog.
/// </summary> /// </summary>
/// <param name="dalamud">The <see cref="Dalamud"/> instance to read information from.</param> internal static void LogTroubleshooting()
/// <param name="isInterfaceLoaded">Whether or not the interface was loaded.</param>
internal static void LogTroubleshooting(Dalamud dalamud, bool isInterfaceLoaded)
{ {
var interfaceManager = Service<InterfaceManager>.Get();
var startInfo = Service<DalamudStartInfo>.Get(); var startInfo = Service<DalamudStartInfo>.Get();
var pluginManager = Service<PluginManager>.Get();
var configuration = Service<DalamudConfiguration>.Get(); var configuration = Service<DalamudConfiguration>.Get();
var interfaceManager = Service<InterfaceManager>.GetNullable();
var pluginManager = Service<PluginManager>.GetNullable();
try try
{ {
var payload = new TroubleshootingPayload var payload = new TroubleshootingPayload
{ {
LoadedPlugins = pluginManager.InstalledPlugins.Select(x => x.Manifest).ToArray(), LoadedPlugins = pluginManager?.InstalledPlugins?.Select(x => x.Manifest)?.ToArray(),
DalamudVersion = Util.AssemblyVersion, DalamudVersion = Util.AssemblyVersion,
DalamudGitHash = Util.GetGitHash(), DalamudGitHash = Util.GetGitHash(),
GameVersion = startInfo.GameVersion.ToString(), GameVersion = startInfo.GameVersion.ToString(),
Language = startInfo.Language.ToString(), Language = startInfo.Language.ToString(),
DoDalamudTest = configuration.DoDalamudTest, DoDalamudTest = configuration.DoDalamudTest,
DoPluginTest = configuration.DoPluginTest, DoPluginTest = configuration.DoPluginTest,
InterfaceLoaded = interfaceManager.IsReady, InterfaceLoaded = interfaceManager?.IsReady ?? false,
ThirdRepo = configuration.ThirdRepoList, ThirdRepo = configuration.ThirdRepoList,
}; };