From 090c71b44d220ddf8c23bfc609e03e1de4ef7253 Mon Sep 17 00:00:00 2001 From: Anna Date: Sun, 18 Feb 2024 16:06:33 -0500 Subject: [PATCH] fix: handle null groups --- Configuration.cs | 10 ++++++---- Ui/Tabs/DatabaseTab.cs | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Configuration.cs b/Configuration.cs index 5404e28..ffe9837 100644 --- a/Configuration.cs +++ b/Configuration.cs @@ -15,10 +15,12 @@ public class Configuration : IPluginConfiguration { public string SaveFileNameFormat = """ {{ captured_at_local | date.to_string '%Y/%m %b/[%H.%M.%S]' }} - {{ active_character.name }} - - - {{ location }} - + {{ if active_character -}} + {{ active_character.name }} - {{ location }} + {{- else -}} + Main Menu or Loading Screen + {{- end -}} + {{- if area }} ({{ area }}) {{- end -}} {{- if ward }} W{{ ward }} {{- end -}} {{- if plot -}} P{{ plot }} {{- end -}} diff --git a/Ui/Tabs/DatabaseTab.cs b/Ui/Tabs/DatabaseTab.cs index f91ebff..b3d87f2 100644 --- a/Ui/Tabs/DatabaseTab.cs +++ b/Ui/Tabs/DatabaseTab.cs @@ -139,7 +139,7 @@ internal class DatabaseTab : ITab { ImGui.PushID($"{Enum.GetName(groupBy.Value)}-{label}"); using var popId = new OnDispose(ImGui.PopID); - if (!ImGui.TreeNodeEx(label)) { + if (!ImGui.TreeNodeEx(label ?? "")) { continue; } @@ -168,7 +168,7 @@ internal class DatabaseTab : ITab { using var treePop = new OnDispose(ImGui.TreePop); var availWidth = ImGui.GetContentRegionAvail().X; - var buttonWidth = availWidth / 2 - ImGui.GetStyle().ItemSpacing.X; + var buttonWidth = availWidth / 2 - ImGui.GetStyle().ItemSpacing.X / 2; if (ImGui.Button("Open", new Vector2(buttonWidth, 0))) { Process.Start(new ProcessStartInfo(shot.Path) {