github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix crash changing renderer

Browse Source
This commit is contained in:
Stenzek 2025-03-29 18:51:41 +10:00
parent ba3c693717
commit 3cf2f41723
No known key found for this signature in database
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/util/imgui_fullscreen.cpp
View File

@ -710,13 +710,6 @@ ImGuiFullscreen::FixedPopupDialog::~FixedPopupDialog() = default;
void ImGuiFullscreen::FixedPopupDialog::Open(std::string title) void ImGuiFullscreen::FixedPopupDialog::Open(std::string title)
{ {
SetTitleAndOpen(std::move(title)); SetTitleAndOpen(std::move(title));
// fixed dialogs are locked to the parent scope
if (m_state == State::OpeningTrigger)
{
ImGui::OpenPopup(m_title.c_str());
m_state = State::Opening;
}
} }
bool ImGuiFullscreen::FixedPopupDialog::Begin(float scaled_window_padding /* = LayoutScale(20.0f) */, bool ImGuiFullscreen::FixedPopupDialog::Begin(float scaled_window_padding /* = LayoutScale(20.0f) */,
@ -2517,19 +2510,21 @@ bool ImGuiFullscreen::PopupDialog::BeginRender(float scaled_window_padding /* =
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
(m_title.starts_with("##") ? ImGuiWindowFlags_NoTitleBar : 0); (m_title.starts_with("##") ? ImGuiWindowFlags_NoTitleBar : 0);
bool is_open = true; bool is_open = true;
if (!ImGui::Begin(m_title.c_str(), &is_open, window_flags)) if (popup_open && !ImGui::Begin(m_title.c_str(), &is_open, window_flags))
is_open = false; is_open = false;
if (!is_open && m_state != State::ClosingTrigger) if (popup_open && !is_open && m_state != State::ClosingTrigger)
{ {
StartClose(); StartClose();
} }
else if (m_state == State::ClosingTrigger) else if (!popup_open || m_state == State::ClosingTrigger)
{ {
if (popup_open) if (popup_open)
{
ImGui::CloseCurrentPopup(); ImGui::CloseCurrentPopup();
ImGui::EndPopup();
}
ImGui::EndPopup();
ImGui::PopStyleColor(5); ImGui::PopStyleColor(5);
ImGui::PopStyleVar(6); ImGui::PopStyleVar(6);
ImGui::PopFont(); ImGui::PopFont();