qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some segfaults caused by my menu_item->text changes

Browse source
This commit is contained in:
Bill Currie 2002-08-27 08:11:10 +00:00
parent ec47e08e1c
commit f1938f6b36
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/console/menu.c
View file

@ -563,8 +563,11 @@ Menu_KeyEvent (knum_t key, short unicode, qboolean down)
} else if (menu->items && menu->items[menu->cur_item]->func } else if (menu->items && menu->items[menu->cur_item]->func
&& menu->items[menu->cur_item]->allkeys) { && menu->items[menu->cur_item]->allkeys) {
item = menu->items[menu->cur_item]; item = menu->items[menu->cur_item];
G_INT (&menu_pr_state, OFS_PARM0) = if (item->text)
PR_SetString (&menu_pr_state, item->text); G_INT (&menu_pr_state, OFS_PARM0) =
PR_SetString (&menu_pr_state, item->text);
else
G_INT (&menu_pr_state, OFS_PARM0) = 0;
G_INT (&menu_pr_state, OFS_PARM1) = key; G_INT (&menu_pr_state, OFS_PARM1) = key;
PR_ExecuteProgram (&menu_pr_state, item->func); PR_ExecuteProgram (&menu_pr_state, item->func);
if (G_INT (&menu_pr_state, OFS_RETURN)) if (G_INT (&menu_pr_state, OFS_RETURN))
@ -588,8 +591,11 @@ Menu_KeyEvent (knum_t key, short unicode, qboolean down)
{ {
item = menu->items[menu->cur_item]; item = menu->items[menu->cur_item];
if (item->func) { if (item->func) {
G_INT (&menu_pr_state, OFS_PARM0) = if (item->text)
PR_SetString (&menu_pr_state, item->text); G_INT (&menu_pr_state, OFS_PARM0) =
PR_SetString (&menu_pr_state, item->text);
else
G_INT (&menu_pr_state, OFS_PARM0) = 0;
G_INT (&menu_pr_state, OFS_PARM1) = key; G_INT (&menu_pr_state, OFS_PARM1) = key;
PR_ExecuteProgram (&menu_pr_state, item->func); PR_ExecuteProgram (&menu_pr_state, item->func);
} else { } else {