From f503d4955a893ecd128eb9bdf0e8649961c39409 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Sat, 21 Aug 2021 14:05:13 -0400
Subject: [PATCH] Fix troubleshooting after rebase

---
 Dalamud/Troubleshooting.cs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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