anna
/
ChatTwo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: check if Axis fonts are null

This commit is contained in:
Anna 2022-06-24 11:22:20 -04:00
parent 737011c6f8
commit d9fbcc23c5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChatTwo/PluginUi.cs
View File

@ -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) {

2
ChatTwo/Ui/ChatLog.cs
View File

@ -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;
}