All pastes #1388428 Raw Edit

crash walkaround

public diff v1 · immutable
#1388428 ·published 2009-04-10 23:00 UTC
rendered paste body
diff --git a/cl_screen.c b/cl_screen.cindex 0896ee5..1668ff7 100644--- a/cl_screen.c+++ b/cl_screen.c@@ -1462,7 +1462,8 @@ void R_ClearScreen(qboolean fogcolor) 		qglClearStencil(128);CHECKGLERROR 	} 	// clear the screen-	if (r_render.integer)+        int walkaround = getenv ("NEXUIZ_PLZ_NO_CRASH_KK") ? FALSE : TRUE;+	if (walkaround && r_render.integer) 		GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0)); 	// set dithering mode 	if (gl_dither.integer)diff --git a/libcurl.c b/libcurl.cindex 4eac714..f7947b3 100644--- a/libcurl.c+++ b/libcurl.c@@ -482,7 +482,7 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error 		qcurl_easy_cleanup(di->curle); 	} -	if(ok && !di->bytes_received)+	if(!di->callback && ok && !di->bytes_received) 	{ 		Con_Printf("ERROR: empty file\n"); 		ok = false;diff --git a/makefile.inc b/makefile.incindex f5e3e62..c86b46c 100644--- a/makefile.inc+++ b/makefile.inc@@ -167,23 +167,23 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $( CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) -Wall -Wsign-compare -Wdeclaration-after-statement CFLAGS_DEBUG=-ggdb CFLAGS_PROFILE=-g -pg -ggdb-CFLAGS_RELEASE=+CFLAGS_RELEASE=-g CFLAGS_SDL=$(SDLCONFIG_CFLAGS)  OPTIM_DEBUG=$(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS) #OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)-OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)+OPTIM_RELEASE=-O2 -g -fno-strict-aliasing $(CPUOPTIMIZATIONS) # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag -DO_CC=$(CC) $(CFLAGS) -c $< -o $@+DO_CC=$(CC) $(CFLAGS) -g -c $< -o $@   # Link LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=debug LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=profile-LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release+LDFLAGS_RELEASE=$(OPTIM_RELEASE) -g3 -DSVNREVISION=`test -d .svn && svnversion || echo -` -DBUILDTYPE=release   ##### UNIX specific variables #####@@ -346,7 +346,7 @@ cl-release : 		EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1  cl-nexuiz :-	$(MAKE) bin-release \+	$(MAKE) bin-debug \ 		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \ 		EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)" LEVEL=1