projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
671a301
)
was setting NULL incorrectly to cancel actions and then not checking for NULL before...
author
Dana Jansens
<danakj@orodu.net>
Mon, 27 Oct 2003 19:52:49 +0000
(19:52 +0000)
committer
Dana Jansens
<danakj@orodu.net>
Mon, 27 Oct 2003 19:52:49 +0000
(19:52 +0000)
openbox/action.c
patch
|
blob
|
history
diff --git
a/openbox/action.c
b/openbox/action.c
index
4ea50fe
..
17d951c
100644
(file)
--- a/
openbox/action.c
+++ b/
openbox/action.c
@@
-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)