Update of /cvsroot/jake2/jake2/src/jake2/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14358/src/jake2/server
Modified Files:
SV_USER.java
Log Message:
npe fix in SV_BeginDownload_f
Index: SV_USER.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_USER.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SV_USER.java 16 Nov 2005 22:24:53 -0000 1.9
--- SV_USER.java 17 Dec 2005 20:32:01 -0000 1.10
***************
*** 418,421 ****
--- 418,428 ----
SV_MAIN.sv_client.download = FS.LoadFile(name);
+
+ // rst: this handles loading errors, no message yet visible
+ if (SV_MAIN.sv_client.download == null)
+ {
+ return;
+ }
+
SV_MAIN.sv_client.downloadsize = SV_MAIN.sv_client.download.length;
SV_MAIN.sv_client.downloadcount = offset;
***************
*** 427,431 ****
// came from a pak file, don't
// allow
! // download ZOID
|| (name.startsWith("maps/") && FS.file_from_pak != 0)) {
Com.DPrintf("Couldn't download " + name + " to "
--- 434,438 ----
// came from a pak file, don't
// allow
! // download ZOID
|| (name.startsWith("maps/") && FS.file_from_pak != 0)) {
Com.DPrintf("Couldn't download " + name + " to "
|
