diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-06-16 18:29:45 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-06-16 18:29:45 +0000 |
commit | d3cbd38cfb851df26255f540cf1bad69e525c15f (patch) | |
tree | 42a51f465d91c3401ec85ab7db83aaf1c84e2883 /navit/osd.c | |
parent | 6c94a2686b7ce42481a51559ce674d2efadf6de5 (diff) | |
download | navit-d3cbd38cfb851df26255f540cf1bad69e525c15f.tar.gz |
Fix:Core:Handle saved command callbacks correctly
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5143 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/osd.c')
-rw-r--r-- | navit/osd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/navit/osd.c b/navit/osd.c index a2feeb22d..8f5d5ce19 100644 --- a/navit/osd.c +++ b/navit/osd.c @@ -169,7 +169,9 @@ static void osd_std_reconfigure(struct osd_item *item, struct command_saved *cs) { if (!command_saved_error(cs)) { - graphics_overlay_disable(item->gr, !command_saved_get_int(cs)); + item->configured = !! command_saved_get_int(cs); + if (item->gr && !(item->flags & 16)) + graphics_overlay_disable(item->gr, !item->configured); } else { dbg(0, "Error in saved command: %i\n", command_saved_error(cs)); } @@ -208,7 +210,7 @@ osd_set_std_attr(struct attr **attrs, struct osd_item *item, int flags) attr=attr_search(attrs, NULL, attr_enable_expression); if (attr) { - item->enable_cs = command_saved_new(attr->u.str, item->navit, NULL); + item->enable_cs = command_saved_new(attr->u.str, item->navit, NULL, 0); } attr = attr_search(attrs, NULL, attr_w); |