diff --git a/ChatTwo/PluginUi.cs b/ChatTwo/PluginUi.cs index b77697b..05fec24 100755 --- a/ChatTwo/PluginUi.cs +++ b/ChatTwo/PluginUi.cs @@ -15,8 +15,8 @@ internal sealed class PluginUi : IDisposable { internal bool ScreenshotMode; internal string Salt { get; } - internal GameFontHandle Axis { get; private set; } - internal GameFontHandle AxisItalic { get; private set; } + internal GameFontHandle? Axis { get; private set; } + internal GameFontHandle? AxisItalic { get; private set; } internal ImFontPtr? RegularFont { get; private set; } internal ImFontPtr? ItalicFont { get; private set; } @@ -135,12 +135,12 @@ internal sealed class PluginUi : IDisposable { var font = this.RegularFont.HasValue; var pushed = font && this.Plugin.Config.FontsEnabled; - var axis = !this.Plugin.Config.FontsEnabled && this.Axis.Available; + var axis = !this.Plugin.Config.FontsEnabled && (this.Axis?.Available ?? false); if (pushed) { ImGui.PushFont(this.RegularFont!.Value); } else if (axis) { - ImGui.PushFont(this.Axis.ImFont); + ImGui.PushFont(this.Axis!.ImFont); } foreach (var component in this.Components) { diff --git a/ChatTwo/Ui/ChatLog.cs b/ChatTwo/Ui/ChatLog.cs index a820b81..d3b649d 100755 --- a/ChatTwo/Ui/ChatLog.cs +++ b/ChatTwo/Ui/ChatLog.cs @@ -1332,7 +1332,7 @@ internal sealed class ChatLog : IUiComponent { pushed = true; } - if (!this.Ui.Plugin.Config.FontsEnabled && this.Ui.AxisItalic.Available) { + if (!this.Ui.Plugin.Config.FontsEnabled && (this.Ui.AxisItalic?.Available ?? false)) { ImGui.PushFont(this.Ui.AxisItalic.ImFont); pushed = true; }