Skip to content

Commit

Permalink
Fix crash in merge axis dialog due to vJoy inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
WhiteMagic committed Apr 22, 2018
1 parent 9613848 commit 7ee1899
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion gremlin/ui/merge_axis.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ def __init__(self, change_cb, profile_data, parent=None):
# mapping selection
self.vjoy_selector = common.VJoySelector(
change_cb,
[gremlin.common.InputType.JoystickAxis]
[gremlin.common.InputType.JoystickAxis],
profile_data.settings.vjoy_as_input
)
self.joy1_selector = common.JoystickSelector(
change_cb,
Expand Down

0 comments on commit 7ee1899

Please sign in to comment.