Merge pull request #35430 from BastiaanOlij/fix_vr_joystick_id
Incorrect joystick id was returned on an inactive ARVR controller
This commit is contained in:
commit
7e76a67d1e
1 changed files with 2 additions and 1 deletions
|
@ -295,7 +295,8 @@ int ARVRController::get_joystick_id() const {
|
|||
|
||||
ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, controller_id);
|
||||
if (tracker == NULL) {
|
||||
return 0;
|
||||
// No tracker? no joystick id... (0 is our first joystick)
|
||||
return -1;
|
||||
};
|
||||
|
||||
return tracker->get_joy_id();
|
||||
|
|
Loading…
Reference in a new issue