engine: client: properly exit from touch editor to menu when user have chosen to cancel and reset
This commit is contained in:
parent
943a30af04
commit
dd570b616b
1 changed files with 8 additions and 4 deletions
|
@ -767,14 +767,18 @@ static void Touch_ReloadConfig_f( void )
|
||||||
touch.state = state_none;
|
touch.state = state_none;
|
||||||
if( touch.edit )
|
if( touch.edit )
|
||||||
touch.edit->finger = -1;
|
touch.edit->finger = -1;
|
||||||
|
|
||||||
if( touch.selection )
|
if( touch.selection )
|
||||||
touch.selection->finger = -1;
|
touch.selection->finger = -1;
|
||||||
|
|
||||||
touch.edit = touch.selection = NULL;
|
touch.edit = touch.selection = NULL;
|
||||||
touch.resize_finger = touch.move_finger = touch.look_finger = touch.wheel_finger = -1;
|
touch.resize_finger = touch.move_finger = touch.look_finger = touch.wheel_finger = -1;
|
||||||
if( FS_FileExists( touch_config_file.string, true ) )
|
|
||||||
{
|
if( touch_in_menu.value )
|
||||||
|
Cvar_DirectSet( &touch_in_menu, "0" );
|
||||||
|
|
||||||
|
if( FS_FileExists( touch_config_file.string, true ))
|
||||||
Cbuf_AddTextf( "exec \"%s\"\n", touch_config_file.string );
|
Cbuf_AddTextf( "exec \"%s\"\n", touch_config_file.string );
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Touch_LoadDefaults_f();
|
Touch_LoadDefaults_f();
|
||||||
|
|
Loading…
Add table
Reference in a new issue