From 53988208677e4e36a62fc5502d0aabd13e121cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 24 Feb 2024 18:49:57 +0700 Subject: [PATCH] Crashfix on memstick screen. Fixes #18886 --- UI/MemStickScreen.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp index 33b44e479953..e1ce78926884 100644 --- a/UI/MemStickScreen.cpp +++ b/UI/MemStickScreen.cpp @@ -218,7 +218,7 @@ void MemStickScreen::CreateViews() { if (choice_ == CHOICE_BROWSE_FOLDER || choice_ == CHOICE_SET_MANUAL) { UI::View *extraView = nullptr; if (!g_Config.memStickDirectory.empty()) { - extraView = new TextView(StringFromFormat(" %s: %s", iz->T("Current"), g_Config.memStickDirectory.ToVisualString().c_str()), ALIGN_LEFT, false); + extraView = new TextView(StringFromFormat(" %s: %s", iz->T_cstr("Current"), g_Config.memStickDirectory.ToVisualString().c_str()), ALIGN_LEFT, false); } AddExplanation(leftColumn, (MemStickScreen::Choice)choice_, extraView); } @@ -226,7 +226,7 @@ void MemStickScreen::CreateViews() { std::string privateString(iz->T("Use App Private Data")); if (initialSetup_) { - privateString = StringFromFormat("%s (%s)", iz->T("Skip for now"), privateString.c_str()); + privateString = StringFromFormat("%s (%s)", iz->T_cstr("Skip for now"), privateString.c_str()); } leftColumn->Add(new RadioButton(&choice_, CHOICE_PRIVATE_DIRECTORY, privateString))->OnClick.Handle(this, &MemStickScreen::OnChoiceClick); @@ -236,7 +236,7 @@ void MemStickScreen::CreateViews() { leftColumn->Add(new Spacer(new LinearLayoutParams(FILL_PARENT, 12.0f, 0.0f))); - std::string_view confirmButtonText = nullptr; + std::string_view confirmButtonText = ""; ImageID confirmButtonImage = ImageID::invalid(); switch (choice_) { case CHOICE_BROWSE_FOLDER: