From 48076d27e365fc2e7a13a9a6b020aa1c8dfe6d6d Mon Sep 17 00:00:00 2001 From: nickci2002 Date: Thu, 19 Jun 2025 17:47:53 -0400 Subject: [PATCH] FIxed memory.cpp errors from testing PR #3117 (MacOS fixes) --- src/core/memory.h | 2 +- src/qt_gui/kbm_help_dialog.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/memory.h b/src/core/memory.h index 6ffdec2c9..d0a2a09b4 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -93,7 +93,7 @@ struct VirtualMemoryArea { VMAType type = VMAType::Free; MemoryProt prot = MemoryProt::NoAccess; bool disallow_merge = false; - std::string_view name = ""; + std::string name = ""; uintptr_t fd = 0; bool is_exec = false; diff --git a/src/qt_gui/kbm_help_dialog.cpp b/src/qt_gui/kbm_help_dialog.cpp index e95ded2d0..bd229f689 100644 --- a/src/qt_gui/kbm_help_dialog.cpp +++ b/src/qt_gui/kbm_help_dialog.cpp @@ -205,8 +205,10 @@ Controller: If you have a controller that has different names for buttons, it will still work, just look up what are the equivalent names for that controller The same left-right rule still applies here. Buttons: - 'triangle', 'circle', 'cross', 'square', 'l1', 'l3', - 'options', 'touchpad', 'up', 'down', 'left', 'right' + 'triangle', 'circle', 'cross', 'square', 'l1', 'l3', + 'options', touchpad', 'up', 'down', 'left', 'right' + Input-only: + 'lpaddle_low', 'lpaddle_high' Axes if you bind them to a button input: 'axis_left_x_plus', 'axis_left_x_minus', 'axis_left_y_plus', 'axis_left_y_minus', 'axis_right_x_plus', ..., 'axis_right_y_minus',