From 954200b5ae0075009c0e94f9c33152ae361dd8d9 Mon Sep 17 00:00:00 2001 From: MgAl2O4 <51430403+MgAl2O4@users.noreply.github.com> Date: Wed, 13 Oct 2021 19:53:57 -0400 Subject: [PATCH] fix: crash in imgui dialogs --- .../Interface/ImGuiFileDialog/FileDialog.Files.cs | 13 ++++++++----- Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs | 5 +++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs index c7398a6b3..6630c0439 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.Files.cs @@ -327,12 +327,15 @@ namespace Dalamud.Interface.ImGuiFileDialog Text = "Documents", }); - this.quickAccess.Add(new SideBarItem + if (!string.IsNullOrEmpty(personal)) { - Icon = (char)FontAwesomeIcon.Download, - Location = Path.Combine(personal, "Downloads"), - Text = "Downloads", - }); + this.quickAccess.Add(new SideBarItem + { + Icon = (char)FontAwesomeIcon.Download, + Location = Path.Combine(personal, "Downloads"), + Text = "Downloads", + }); + } this.quickAccess.Add(new SideBarItem { diff --git a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs index 121fdbb6d..d5010f13c 100644 --- a/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs +++ b/Dalamud/Interface/ImGuiFileDialog/FileDialog.UI.cs @@ -335,6 +335,11 @@ namespace Dalamud.Interface.ImGuiFileDialog foreach (var quick in this.quickAccess) { + if (string.IsNullOrEmpty(quick.Location)) + { + continue; + } + ImGui.PushFont(UiBuilder.IconFont); if (ImGui.Selectable($"{quick.Icon}##{quick.Text}", quick.Text == this.selectedSideBar)) {