summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2013-12-06 03:59:26 +0000
committerSimon Howard2013-12-06 03:59:26 +0000
commit78ac59a26c85ab5245810e9bf496af6515e8afe0 (patch)
treeddb957fecfa837690def86cc1dcef734379c4955 /src
parentb662a3d8e84ca176b82406dbc4c28075413eb9d9 (diff)
downloadchocolate-doom-78ac59a26c85ab5245810e9bf496af6515e8afe0.tar.gz
chocolate-doom-78ac59a26c85ab5245810e9bf496af6515e8afe0.tar.bz2
chocolate-doom-78ac59a26c85ab5245810e9bf496af6515e8afe0.zip
Fix crash caused by Strife nicknames (thanks fabian).
Subversion-branch: /branches/v2-branch Subversion-revision: 2760
Diffstat (limited to 'src')
-rw-r--r--src/strife/hu_stuff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c
index 6ee62907..b9e13f8a 100644
--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -274,7 +274,7 @@ void HU_Start(void)
// haleyjd 09/18/10: [STRIFE] nickname weirdness.
if(nickname != player_names[consoleplayer])
{
- if(*nickname)
+ if(nickname != NULL && *nickname)
{
DEH_printf("have one\n");
nickname = player_names[consoleplayer];