diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-26 12:49:37 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-26 12:49:37 +0000 |
commit | 42cd27b2deb99cdc843da4b72686e4e272406bc6 (patch) | |
tree | a2c14e67070b8c47f5fbf3185e2bbc0bb63a4892 /navit/osd/core | |
parent | 70998a37f7e2b57ad098716dcb092b2a39929f28 (diff) | |
download | navit-42cd27b2deb99cdc843da4b72686e4e272406bc6.tar.gz |
Add:osd:Log error if toggle_announcer configured but no speech available.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5975 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/osd/core')
-rw-r--r-- | navit/osd/core/osd_core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 2351b9c90..06bbeeac7 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -1858,7 +1858,12 @@ osd_nav_toggle_announcer_draw(struct osd_priv_common *opc, struct navit *navit, char *gui_sound_on = "gui_sound"; struct attr attr, speechattr; - if (!navit_get_attr(navit, attr_speech, &speechattr, NULL) || !speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL)) + if (!navit_get_attr(navit, attr_speech, &speechattr, NULL)) + { + dbg(lvl_error, "No speech plugin available, toggle_announcer disabled.\n"); + return; + } + if (!speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL)) attr.u.num = 1; this->active = attr.u.num; @@ -1868,7 +1873,7 @@ osd_nav_toggle_announcer_draw(struct osd_priv_common *opc, struct navit *navit, do_draw = 1; } - if (do_draw) + if (do_draw) { graphics_draw_mode(opc->osd_item.gr, draw_mode_begin); p.x = 0; |