archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-02 04:51:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

UI: Fix assertions (#1623)
Some checks failed
Generate translation template / generate-pot (push) Failing after 41s
Details
Build check / build (push) Has been cancelled
Details

Browse source
This commit is contained in:
oltolm 2025-06-30 00:15:23 +02:00 • committed by GitHub
parent 9fb3c76b76
commit 6c392d5a22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/DownloadGraphicPacksWindow.cpp
View file

@ -182,14 +182,14 @@ void DownloadGraphicPacksWindow::UpdateThread()
if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile)) if (checkGraphicPackDownloadedVersion(assetName, hasVersionFile))
{ {
// already up to date // 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; m_threadState = ThreadFinished;
return; return;
} }
if (hasVersionFile) if (hasVersionFile)
{ {
// if a version file already exists (and graphic packs are installed) ask the user if he really wants to update // 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 // cancel update
m_threadState = ThreadFinished; m_threadState = ThreadFinished;
@ -336,7 +336,7 @@ int DownloadGraphicPacksWindow::ShowModal()
{ {
if(CafeSystem::IsTitleRunning()) 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; return wxID_CANCEL;
} }
m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this); m_thread = std::thread(&DownloadGraphicPacksWindow::UpdateThread, this);

7
src/gui/input/panels/InputPanel.cpp
View file

@ -174,12 +174,7 @@ void InputPanel::load_controller(const EmulatedControllerPtr& controller)
continue; continue;
auto button_name = controller->get_mapping_name(mapping); auto button_name = controller->get_mapping_name(mapping);
#if BOOST_OS_WINDOWS text->ChangeValue(button_name);
text->SetLabelText(button_name);
#else
// SetLabelText doesn't seem to work here for some reason on wxGTK
text->ChangeValue(button_name);
#endif
} }
} }