From 35be8bb7f9fa3d040e895c6ef6c7a8887c0c1386 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 21 Oct 2024 15:39:04 -0700 Subject: [PATCH] Fixed warning C4456: declaration of 'e' hides previous local declaration This also fixes incorrect interpretation of OPENVR_SetupJoystckBasedOnLoadedActionManifest() return value. --- src/video/openvr/SDL_openvrvideo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/video/openvr/SDL_openvrvideo.c b/src/video/openvr/SDL_openvrvideo.c index 9736b9aa73..e04e1aea54 100644 --- a/src/video/openvr/SDL_openvrvideo.c +++ b/src/video/openvr/SDL_openvrvideo.c @@ -521,7 +521,7 @@ static void OPENVR_VirtualControllerUpdate(void *userdata) return; } -static bool OPENVR_SetupJoystckBasedOnLoadedActionManifest(SDL_VideoData * videodata) +static bool OPENVR_SetupJoystickBasedOnLoadedActionManifest(SDL_VideoData * videodata) { SDL_VirtualJoystickDesc desc; int virtual_index; @@ -1646,8 +1646,7 @@ static SDL_VideoDevice *OPENVR_CreateDevice(void) goto error; } } else { - int e = OPENVR_SetupJoystckBasedOnLoadedActionManifest(data); - if(e) { + if(!OPENVR_SetupJoystickBasedOnLoadedActionManifest(data)) { goto error; } }