From 9a84b7f74942e996721bf89db9cacca826a267ea Mon Sep 17 00:00:00 2001 From: oltolm Date: Thu, 27 Nov 2025 00:32:36 +0100 Subject: [PATCH] UI: use wxGetApp() instead of wxTheApp --- src/gui/wxgui/GeneralSettings2.cpp | 8 ++++---- src/gui/wxgui/GettingStartedDialog.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/wxgui/GeneralSettings2.cpp b/src/gui/wxgui/GeneralSettings2.cpp index 0c6968bc..47655132 100644 --- a/src/gui/wxgui/GeneralSettings2.cpp +++ b/src/gui/wxgui/GeneralSettings2.cpp @@ -1082,7 +1082,7 @@ uint32 GeneralSettings2::GetSelectedAccountPersistentId() void GeneralSettings2::StoreConfig() { - auto* app = (CemuApp*)wxTheApp; + auto& app = wxGetApp(); auto& config = GetConfig(); auto& wxGuiConfig = GetWxGUIConfig(); @@ -1121,7 +1121,7 @@ void GeneralSettings2::StoreConfig() else { const auto language = m_language->GetStringSelection(); - for (const auto& lang : app->GetLanguages()) + for (const auto& lang : app.GetLanguages()) { if (lang->DescriptionNative == language) { @@ -1841,8 +1841,8 @@ void GeneralSettings2::ApplyConfig() m_game_paths->Append(wxString::FromUTF8(path)); } - const auto app = (CemuApp*)wxTheApp; - for (const auto& language : app->GetLanguages()) + const auto& app = wxGetApp(); + for (const auto& language : app.GetLanguages()) { if (wxGUIconfig.language == language->Language) { diff --git a/src/gui/wxgui/GettingStartedDialog.cpp b/src/gui/wxgui/GettingStartedDialog.cpp index c2a0eb2e..31065200 100644 --- a/src/gui/wxgui/GettingStartedDialog.cpp +++ b/src/gui/wxgui/GettingStartedDialog.cpp @@ -75,13 +75,13 @@ wxPanel* GettingStartedDialog::CreatePage1() GetConfig().language = wxLANGUAGE_DEFAULT; else { - auto* app = (CemuApp*)wxTheApp; + auto& app = wxGetApp(); const auto language = m_language->GetStringSelection(); - for (const auto& lang : app->GetLanguages()) + for (const auto& lang : app.GetLanguages()) { if (lang->DescriptionNative == language) { - app->LocalizeUI(static_cast(lang->Language)); + app.LocalizeUI(static_cast(lang->Language)); wxCommandEvent event(EVT_REFRESH_FIRST_PAGE); wxPostEvent(this, event); break;