Crashfix on memstick screen.

Fixes hrydgard#18886
sum2012 · Feb 24, 2024 · 5398820 · 5398820
1 parent d5cfccc
commit 5398820
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/UI/MemStickScreen.cpp b/UI/MemStickScreen.cpp
@@ -218,15 +218,15 @@ 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);
 	}
 
 	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: