From a4017797155cbfb13441849986ece8675de29d06 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 9 Jul 2010 03:04:43 +0000 Subject: [PATCH] - Fixed: FMugShotFrame::GetTexture() needs to NULL-check skin_face. (default_face might also be empty. I don't know if that deserves special handling, but it doesn't crash, so I'll let blzut3 worry about it.) SVN r2419 (trunk) --- src/g_shared/sbar_mugshot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_shared/sbar_mugshot.cpp b/src/g_shared/sbar_mugshot.cpp index cecae1df3..e48a047bb 100644 --- a/src/g_shared/sbar_mugshot.cpp +++ b/src/g_shared/sbar_mugshot.cpp @@ -84,7 +84,7 @@ FTexture *FMugShotFrame::GetTexture(const char *default_face, const char *skin_f { index = Graphic.Size() - 1; } - FString sprite(skin_face[0] != 0 ? skin_face : default_face, 3); + FString sprite(skin_face != NULL && skin_face[0] != 0 ? skin_face : default_face, 3); sprite += Graphic[index]; if (uses_levels) //change the last character to the level {