From ca47dc59a9106af4a3c1a4011695f9baeb987f8e Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 6 May 2025 16:14:22 -0700
Subject: [PATCH] Fixed building with the OpenVR video driver
---
src/video/openvr/SDL_openvrvideo.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/video/openvr/SDL_openvrvideo.c b/src/video/openvr/SDL_openvrvideo.c
index 03d634578e988..a24cd02fbe9d6 100644
--- a/src/video/openvr/SDL_openvrvideo.c
+++ b/src/video/openvr/SDL_openvrvideo.c
@@ -542,12 +542,12 @@ static bool OPENVR_SetupJoystickBasedOnLoadedActionManifest(SDL_VideoData * vide
virtual_id = SDL_AttachVirtualJoystick(&desc);
if (!virtual_id) {
+ return SDL_SetError("OPENVR: Couldn't attach virtual joystick device: %s", SDL_GetError());
+ }
+
+ videodata->virtual_joystick = SDL_OpenJoystick(virtual_id);
+ if (!videodata->virtual_joystick) {
return SDL_SetError("OPENVR: Couldn't open virtual joystick device: %s", SDL_GetError());
- } else {
- videodata->virtual_joystick = SDL_OpenJoystick(virtual_index);
- if (!videodata->virtual_joystick) {
- return SDL_SetError("OPENVR: Couldn't open virtual joystick device: %s", SDL_GetError());
- }
}
#ifdef DEBUG_OPENVR