From cc9e7aba61de005d0da4c4003fbf7e3bcaeb6521 Mon Sep 17 00:00:00 2001 From: Spider <29214314+spide-r@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:04:34 -0500 Subject: [PATCH] Resolved issue w/ invalid style --- ChatTwo/Ui/ChatLogWindow.cs | 22 ++++++++++++++++++---- ChatTwo/Ui/Popout.cs | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/ChatTwo/Ui/ChatLogWindow.cs b/ChatTwo/Ui/ChatLogWindow.cs index 458a67f..e41d396 100644 --- a/ChatTwo/Ui/ChatLogWindow.cs +++ b/ChatTwo/Ui/ChatLogWindow.cs @@ -101,19 +101,33 @@ public sealed class ChatLogWindow : Window, IUiComponent { public override void PreDraw() { - if (Plugin.Config.OverrideStyle) + if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "") { var styles = StyleModel.GetConfiguredStyles(); - styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Push(); + try + { + styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Push(); + } + catch (InvalidOperationException e) + { + // Swallow the error - User does not have a valid style set + } } } public override void PostDraw() { - if (Plugin.Config.OverrideStyle) + if (Plugin.Config.OverrideStyle && Plugin.Config.ChosenStyle != "") { var styles = StyleModel.GetConfiguredStyles(); - styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Pop(); + try + { + styles?.First(style => style.Name.Equals(Plugin.Config.ChosenStyle)).Pop(); + } + catch (InvalidOperationException e) + { + // Swallow the error - User does not have a valid style set + } } } diff --git a/ChatTwo/Ui/Popout.cs b/ChatTwo/Ui/Popout.cs index 31d6a94..19ffa1f 100644 --- a/ChatTwo/Ui/Popout.cs +++ b/ChatTwo/Ui/Popout.cs @@ -25,10 +25,17 @@ internal class Popout : Window public override void PreDraw() { - if (ChatLogWindow.Plugin.Config.OverrideStyle) + if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "") { var styles = StyleModel.GetConfiguredStyles(); - styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Push(); + try + { + styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Push(); + } + catch (InvalidOperationException e) + { + // Swallow the error - User does not have a valid style set + } } Flags = ImGuiWindowFlags.None; if (!ChatLogWindow.Plugin.Config.ShowPopOutTitleBar) @@ -59,10 +66,17 @@ internal class Popout : Window { ChatLogWindow.PopOutDocked[Idx] = ImGui.IsWindowDocked(); - if (ChatLogWindow.Plugin.Config.OverrideStyle) + if (ChatLogWindow.Plugin.Config.OverrideStyle && ChatLogWindow.Plugin.Config.ChosenStyle != "") { var styles = StyleModel.GetConfiguredStyles(); - styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Pop(); + try + { + styles?.First(style => style.Name.Equals(ChatLogWindow.Plugin.Config.ChosenStyle)).Pop(); + } + catch (InvalidOperationException e) + { + // Swallow the error - User does not have a valid style set + } } }