zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a potential NULL assignment in FOptionMenuItemSafeCommand::Activate

This commit is contained in:
nashmuhandes 2016-04-14 22:29:59 +08:00 committed by Christoph Oelckers
parent 6bfdd10a5c
commit a30eb4d709
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu/optionmenuitems.h
View File

@ -133,9 +133,9 @@ public:
}
FString FullString;
FullString.Format(TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "\n\n" "%s", actionLabel, msg);
FullString.Format(TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "\n\n" "%s", actionLabel != NULL ? actionLabel : "", msg);
if (msg && actionLabel && FullString) M_StartMessage(FullString, 0);
if (msg && FullString) M_StartMessage(FullString, 0);
return true;
}
};