Skip to content

UI: fix assertions #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Exzap merged 1 commit into from
Jun 29, 2025
Merged

UI: fix assertions #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/gui/DownloadGraphicPacksWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,14 @@ void DownloadGraphicPacksWindow::UpdateThread()
if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile))
{
// already up to date
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this->GetParent());
wxMessageBox(_("No updates available."), _("Graphic packs"), wxOK | wxCENTRE, this);
m_threadState = ThreadFinished;
return;
}
if (hasVersionFile)
{
// if a version file already exists (and graphic packs are installed) ask the user if he really wants to update
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this->GetParent()) != wxYES)
if (wxMessageBox(_("Updated graphic packs are available. Do you want to download and install them?"), _("Graphic packs"), wxYES_NO, this) != wxYES)
{
// cancel update
m_threadState = ThreadFinished;
Expand Down Expand Up @@ -336,7 +336,7 @@ int DownloadGraphicPacksWindow::ShowModal()
{
if(CafeSystem::IsTitleRunning())
{
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this->GetParent());
wxMessageBox(_("Graphic packs cannot be updated while a game is running."), _("Graphic packs"), 5, this);
return wxID_CANCEL;
}
m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this);
Expand Down
7 changes: 1 addition & 6 deletions src/gui/input/panels/InputPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,7 @@ void InputPanel::load_controller(const EmulatedControllerPtr& controller)
continue;

auto button_name = controller->get_mapping_name(mapping);
#if BOOST_OS_WINDOWS
text->SetLabelText(button_name);
#else
// SetLabelText doesn't seem to work here for some reason on wxGTK
text->ChangeValue(button_name);
#endif
text->ChangeValue(button_name);
}
}

Expand Down
Loading