ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #867 from reicast/fix/issue-848 

reicast-joyconfig: Fix crash if button/axis is unnamed
This commit is contained in:
Jan Holthuis 2015-11-14 00:22:22 +01:00
parent 01c7920d1e 5aed3dffc4
commit f5f3332b09
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shell/linux/tools/reicast-joyconfig.py
View File

@ -87,10 +87,10 @@ def read_axis_or_key(dev, absinfos):
def print_mapped_button(name, event):
try:
code_id = evdev.ecodes.BTN[event.code]
except IndexError:
except (IndexError, KeyError):
try:
code_id = evdev.ecodes.KEY[event.code]
except IndexError:
except (IndexError, KeyError):
code_id = None
if type(code_id) is list:
code_id = code_id[0]
@ -101,7 +101,7 @@ def print_mapped_button(name, event):
def print_mapped_axis(name, event, axis_inverted=False):
try:
code_id = evdev.ecodes.ABS[event.code]
except IndexError:
except (IndexError, KeyError):
code_id = None
if type(code_id) is list:
code_id = code_id[0]