was setting NULL incorrectly to cancel actions and then not checking for NULL before using it
This commit is contained in:
parent
671a30187f
commit
7c80db2552
1 changed files with 3 additions and 2 deletions
|
@ -395,7 +395,7 @@ void setup_action_showmenu(ObAction **a, ObUserAction uact)
|
|||
a time! */
|
||||
if (uact == OB_USER_ACTION_MENU_SELECTION) {
|
||||
action_unref(*a);
|
||||
a = NULL;
|
||||
*a = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -817,7 +817,8 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue