The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-25 18:46:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on GTK when a gfx pack preset value is changed (#300)

Browse Source
This commit is contained in:
SSimco 2022-09-25 22:53:10 -07:00 committed by GitHub
parent 53c7daa603
commit 25dae98ce0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/GraphicPacksWindow2.cpp
View File

@ -529,6 +529,38 @@ void GraphicPacksWindow2::OnTreeChoiceChanged(wxTreeEvent& event)
m_graphic_pack_tree->SelectItem(item);
}
// In some environments with GTK (e.g. a flatpak app with org.freedesktop.Platform 22.08 runtime),
// destroying the event source inside the handler crashes the app.
// As a workaround to that, the wxWindow that needs to be destroyed is hidden and then
// destroyed at a later time, outside the handler.
void GraphicPacksWindow2::ClearPresets()
{
size_t item_count = m_preset_sizer->GetItemCount();
std::vector<wxSizer*> sizers;
sizers.reserve(item_count);
for (size_t i = 0; i < item_count; i++)
sizers.push_back(m_preset_sizer->GetItem(i)->GetSizer());
for (auto&& sizer : sizers)
{
auto static_box_sizer = dynamic_cast<wxStaticBoxSizer*>(sizer);
if (static_box_sizer)
{
wxStaticBox* parent_window = static_box_sizer->GetStaticBox();
if (parent_window)
{
m_preset_sizer->Detach(sizer);
parent_window->Hide();
CallAfter([=]()
{
parent_window->DestroyChildren();
delete static_box_sizer;
});
}
}
}
}
void GraphicPacksWindow2::OnActivePresetChanged(wxCommandEvent& event)
{
if (!m_shown_graphic_pack)
@ -542,7 +574,7 @@ void GraphicPacksWindow2::OnActivePresetChanged(wxCommandEvent& event)
if(m_shown_graphic_pack->SetActivePreset(string_data->GetData().c_str().AsChar(), preset))
{
wxWindowUpdateLocker lock(this);
m_preset_sizer->Clear(true);
ClearPresets();
LoadPresetSelections(m_shown_graphic_pack);
//m_preset_sizer->GetContainingWindow()->Layout();
//m_right_panel->FitInside();

1
src/gui/GraphicPacksWindow2.h
View File

@ -27,6 +27,7 @@ private:
bool m_filter_installed_games;
std::vector<uint64_t> m_installed_games;
void ClearPresets();
void FillGraphicPackList() const;
void GetChildren(const wxTreeItemId& id, std::vector<wxTreeItemId>& children) const;
void ExpandChildren(const std::vector<wxTreeItemId>& ids, size_t& counter) const;