fix joystick pick
Merge pull request #3940 from ZappoMan/master

fix joystick pick