From c96f8ba722771112204ece51942659d18745cf15 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 30 Apr 2023 10:12:33 +0300 Subject: [PATCH] engine: client: in_joy: do not create cvar on shutdown --- engine/client/in_joy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/client/in_joy.c b/engine/client/in_joy.c index e1932ad2..db577eb6 100644 --- a/engine/client/in_joy.c +++ b/engine/client/in_joy.c @@ -44,6 +44,7 @@ static struct joy_axis_s short prevval; } joyaxis[MAX_AXES] = { 0 }; static byte currentbinding; // add posibility to remap keys, to place it in joykeys[] +static qboolean joy_initialized; convar_t *joy_enable; static convar_t *joy_pitch; static convar_t *joy_yaw; @@ -416,6 +417,8 @@ void Joy_Init( void ) } Cvar_FullSet( "joy_found", va( "%d", Platform_JoyInit( joy_index->value )), FCVAR_READ_ONLY ); + + joy_initialized = true; } /* @@ -427,5 +430,8 @@ Shutdown joystick code */ void Joy_Shutdown( void ) { - Cvar_FullSet( "joy_found", 0, FCVAR_READ_ONLY ); + if( joy_initialized ) + { + Cvar_FullSet( "joy_found", 0, FCVAR_READ_ONLY ); + } }