Merge pull request #5460 from fr500/master

Fix #2566 again
This commit is contained in:
Twinaphex 2017-09-21 16:35:48 +02:00 committed by GitHub
commit cf94e8e9c9
3 changed files with 13 additions and 1 deletions

View File

@ -1,8 +1,16 @@
# 1.6.8 (future)
- Audio: Fix the Audio DSP picker
- GUI: (MaterialUI) Skip querying and drawing items that are not visible; Cache content height and bbox calculation.
- GUI: (XMB) Skip drawing the fading list when it is already transparent. Optimization.
- GUI: (XMB) Comment out visible item calculation in xmb_draw_items().
- GUI: (RGUI) Prevent crashes when using a non-English language reliant on UTF8.
- INPUT: Always show the controls menu even if descriptors are not set
- INPUT: Fix input descriptors not being set on cores that don't implement the controllers interface
- INPUT: Apply descriptors only for the amount of cores the core supports
- INPUT: Implement keyboard to gamepad input remapping (limited to one gamepad device for now)
- INPUT: Fix absolute mouse move handling on the winraw driver
- INPUT: Ignore keyboard input if window is not active on udev driver
- LOBBIES: Fix crash on navigating left / right from the lobby menu
- LOCALIZATION: Update Italian translation.
- LOCALIZATION: Update Portuguese-Brazilian translation.
- LOCALIZATION: Update Russian translation.
@ -14,6 +22,7 @@
- WINDOWS/WGL: Try to use wglSwapLayerBuffers instead of SwapBuffers if possible (for more optimal performance).
- WII: Use custom, embedded libogc SDK.
- WIIU: Initial touchscreen support for WiiU gamepad.
- SCANNER: Fix archive scanning.
# 1.6.7
- SCANNER: Fix directory scanning.

View File

@ -130,7 +130,9 @@ static int action_scan_input_desc(const char *path,
unsigned char player_no_str = atoi(&label[1]);
inp_desc_user = (unsigned)(player_no_str - 1);
key = (unsigned)(idx - 6);
/* This hardcoded value may cause issues if any entries are added on
top of the input binds */
key = (unsigned)(idx - 7);
}
else
key = input_config_translate_str_to_bind_id(label);

View File

@ -372,6 +372,7 @@ static int action_bind_sublabel_netplay_room(
const char *label, const char *path,
char *s, size_t len)
{
/* This offset may cause issues if any entries are added to this menu */
unsigned offset = i - 3;
if (i < 1 || offset > (unsigned)netplay_room_count)