diff options
author | Tim Angus <tim@ngus.net> | 2011-04-23 22:38:25 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:07 +0000 |
commit | 06006eb6930de74c577c87daf6a0f7917e22d578 (patch) | |
tree | 8caec25df040a3f3eddc99b593e51d993b9be1be /src/client/cl_parse.c | |
parent | 98438cc3e7d32312bb52b413c12698b67b8cfeb0 (diff) |
* Merge ioq3-r1946
Diffstat (limited to 'src/client/cl_parse.c')
-rw-r--r-- | src/client/cl_parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/cl_parse.c b/src/client/cl_parse.c index 64404f78..42465f1b 100644 --- a/src/client/cl_parse.c +++ b/src/client/cl_parse.c @@ -413,13 +413,13 @@ void CL_SystemInfoChanged( void ) { else { // If this cvar may not be modified by a server discard the value. - if(!(cvar_flags & (CVAR_SYSTEMINFO | CVAR_SERVER_CREATED))) + if(!(cvar_flags & (CVAR_SYSTEMINFO | CVAR_SERVER_CREATED | CVAR_USER_CREATED))) { Com_Printf(S_COLOR_YELLOW "WARNING: server is not allowed to set %s=%s\n", key, value); continue; } - Cvar_Set(key, value); + Cvar_SetSafe(key, value); } } // if game folder should not be set and it is set at the client side |