From a14433e033f4048c3973fff118aff3551d1e4daa Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 24 Nov 2025 21:56:46 +1000 Subject: [PATCH] FullscreenUI: Fix ImGui asset tripping on empty game grid --- src/core/fullscreenui_game_list.cpp | 4 +++- src/duckstation-mini/mini_host.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/core/fullscreenui_game_list.cpp b/src/core/fullscreenui_game_list.cpp index c7d971412..06a9e9fd5 100644 --- a/src/core/fullscreenui_game_list.cpp +++ b/src/core/fullscreenui_game_list.cpp @@ -768,7 +768,9 @@ void FullscreenUI::DrawGameGrid(const ImVec2& heading_size) u32 grid_x = 0; float row_item_height = base_item_height; - ImGui::SetCursorPosX(ImGui::GetCursorPosX() + x_padding); + if (!s_game_list_locals.game_list_sorted_entries.empty()) + ImGui::SetCursorPosX(ImGui::GetCursorPosX() + x_padding); + for (size_t entry_index = 0; entry_index < s_game_list_locals.game_list_sorted_entries.size(); entry_index++) { if (window->SkipItems) diff --git a/src/duckstation-mini/mini_host.cpp b/src/duckstation-mini/mini_host.cpp index 7fe955438..0f334e760 100644 --- a/src/duckstation-mini/mini_host.cpp +++ b/src/duckstation-mini/mini_host.cpp @@ -1187,10 +1187,10 @@ std::string MiniHost::GetWindowTitle(const std::string& game_title) void MiniHost::WarnAboutInterface() { - Host::AddIconOSDMessage(OSDMessageType::Warning, "MiniWarning", ICON_EMOJI_WARNING, - "This is the \"mini\" interface for DuckStation, and is missing many features.", - "We recommend using the Qt interface instead, which you can download\n" - "from https://www.duckstation.org/."); + Host::AddIconOSDMessage( + OSDMessageType::Warning, "MiniWarning", "images/duck.png", + "This is the \"mini\" interface for DuckStation, and is missing many features.", + "We recommend using the Qt interface instead, which you can download from https://www.duckstation.org/."); } void Host::OnSystemGameChanged(const std::string& disc_path, const std::string& game_serial,