github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-07 12:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

FullscreenUI: Fix crash in hotkey settings

Browse Source
This commit is contained in:
Stenzek 2025-04-12 21:14:47 +10:00
parent b78d3b4b79
commit 65fd6f9ff3
No known key found for this signature in database
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/fullscreen_ui.cpp
View File

@ -3905,10 +3905,9 @@ void FullscreenUI::DrawSettingsWindow()
if (NavButton(ICON_PF_NAVIGATION_BACK, true, true)) if (NavButton(ICON_PF_NAVIGATION_BACK, true, true))
ReturnToPreviousWindow(); ReturnToPreviousWindow();
if (s_state.game_settings_entry) NavTitle(s_state.game_settings_entry ?
NavTitle(s_state.game_settings_entry->title.c_str()); std::string_view(s_state.game_settings_entry->title) :
else Host::TranslateToStringView(TR_CONTEXT, titles[static_cast<u32>(pages[index])].first));
NavTitle(Host::TranslateToCString(TR_CONTEXT, titles[static_cast<u32>(pages[index])].first));
RightAlignNavButtons(count, ITEM_WIDTH, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY); RightAlignNavButtons(count, ITEM_WIDTH, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY);
@ -5101,7 +5100,7 @@ void FullscreenUI::DrawControllerSettingsPage()
{ {
TinyString title; TinyString title;
title.format(ICON_FA_COG "{}", Host::TranslateToStringView(ci->name, si.display_name)); title.format(ICON_FA_COG "{}", Host::TranslateToStringView(ci->name, si.display_name));
const char* description = Host::TranslateToCString(ci->name, si.description); std::string_view description = Host::TranslateToStringView(ci->name, si.description);
switch (si.type) switch (si.type)
{ {
case SettingInfo::Type::Boolean: case SettingInfo::Type::Boolean:
@ -5161,12 +5160,12 @@ void FullscreenUI::DrawHotkeySettingsPage()
{ {
if (!last_category || std::strcmp(hotkey->category, last_category->category) != 0) if (!last_category || std::strcmp(hotkey->category, last_category->category) != 0)
{ {
MenuHeading(Host::TranslateToCString("Hotkeys", hotkey->category)); MenuHeading(Host::TranslateToStringView("Hotkeys", hotkey->category));
last_category = hotkey; last_category = hotkey;
} }
DrawInputBindingButton(bsi, InputBindingInfo::Type::Button, "Hotkeys", hotkey->name, DrawInputBindingButton(bsi, InputBindingInfo::Type::Button, "Hotkeys", hotkey->name,
Host::TranslateToCString("Hotkeys", hotkey->display_name), nullptr, false); Host::TranslateToStringView("Hotkeys", hotkey->display_name), std::string_view(), false);
} }
EndMenuButtons(); EndMenuButtons();
@ -7716,7 +7715,7 @@ void FullscreenUI::DrawGameListWindow()
if (NavButton(ICON_PF_NAVIGATION_BACK, true, true)) if (NavButton(ICON_PF_NAVIGATION_BACK, true, true))
BeginTransition([]() { SwitchToMainWindow(MainWindowType::Landing); }); BeginTransition([]() { SwitchToMainWindow(MainWindowType::Landing); });
NavTitle(Host::TranslateToCString(TR_CONTEXT, titles[static_cast<u32>(s_state.game_list_view)])); NavTitle(Host::TranslateToStringView(TR_CONTEXT, titles[static_cast<u32>(s_state.game_list_view)]));
RightAlignNavButtons(count, ITEM_WIDTH, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY); RightAlignNavButtons(count, ITEM_WIDTH, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY);
for (u32 i = 0; i < count; i++) for (u32 i = 0; i < count; i++)