all repos — openbox @ 7c80db2552c97be9145ce88dd40f80b0873f56ef

openbox fork - make it a bit more like ryudo

was setting NULL incorrectly to cancel actions and then not checking for NULL before using it
Dana Jansens danakj@orodu.net
commit

7c80db2552c97be9145ce88dd40f80b0873f56ef

parent

671a30187f8cdc64c6b0a97eb0c7eb2f33c4247e

1 files changed, 3 insertions(+), 2 deletions(-)

jump to
M openbox/action.copenbox/action.c

@@ -395,7 +395,7 @@ assumptions that there is only one menu (and submenus) open at

a time! */ if (uact == OB_USER_ACTION_MENU_SELECTION) { action_unref(*a); - a = NULL; + *a = NULL; } }

@@ -817,7 +817,8 @@ exist = TRUE;

a = action_new(actionstrings[i].func); if (actionstrings[i].setup) actionstrings[i].setup(&a, uact); - INTERACTIVE_LIMIT(a, uact); + if (a) + INTERACTIVE_LIMIT(a, uact); break; } if (!exist)