yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Behebe das Problem, dass CL_Shutdown() rekursiv ein weiteres Mal

Browse source 
aufgerufen wird. Danke an caedes für das entgödeln.
This commit is contained in:
Yamagi Burmeister 2010-10-19 16:21:02 +00:00
parent 09c87ea0cc
commit ca1f64c016
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/cl_main.c
View file

@ -407,7 +407,7 @@ void CL_Userinfo_f (void)
*/
void CL_Snd_Restart_f (void)
{
S_Shutdown ();
S_Shutdown();
S_Init ();
CL_RegisterSounds ();
}
@ -827,7 +827,6 @@ void CL_Shutdown(void)
CDAudio_Shutdown ();
OGG_Stop();
S_Shutdown();
IN_Shutdown ();
VID_Shutdown();
}

10
src/common/common/com_clientserver.c
View file

@ -220,16 +220,6 @@ void Com_Error (int code, char *fmt, ...)
void Com_Quit (void)
{
SV_Shutdown ("Server quit\n", false);
#ifndef DEDICATED_ONLY
CL_Shutdown ();
#endif
if (logfile)
{
fclose (logfile);
logfile = NULL;
}
Sys_Quit ();
}

8
src/unix/system.c
View file

@ -60,6 +60,7 @@ static DIR *fdir;
qboolean stdin_active = true;
extern cvar_t *nostdout;
extern FILE *logfile;
static qboolean
CompareAttributes ( char *path, char *name, unsigned musthave, unsigned canthave )
@ -270,6 +271,13 @@ Sys_Quit ( void )
#ifndef DEDICATED_ONLY
CL_Shutdown();
#endif
if (logfile)
{
fclose (logfile);
logfile = NULL;
}
Qcommon_Shutdown();
fcntl( 0, F_SETFL, fcntl( 0, F_GETFL, 0 ) & ~FNDELAY );
exit( 0 );

2
src/unix/vid.c
View file

@ -317,7 +317,7 @@ VID_LoadRefresh ( char *name )
( ( IN_Update_fp = dlsym( reflib_library, "IN_Update" ) ) == NULL ) ||
( ( IN_Close_fp = dlsym( reflib_library, "IN_Close" ) ) == NULL ) )
{
Sys_Error( "No KBD functions in REF.\n" );
Sys_Error( "No keyboard input functions in REF.\n" );
}
IN_KeyboardInit_fp( Do_Key_Event );