fixed logic to ensure attr.u.num is initialised

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5164 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/osd/core/osd_core.c b/navit/navit/osd/core/osd_core.c
index 78a770c..35cdbbd 100644 (file)
--- a/navit/navit/osd/core/osd_core.c
+++ b/navit/navit/osd/core/osd_core.c
@@ -1835,9 +1835,8 @@ osd_nav_toggle_announcer_draw(struct osd_priv_common *opc, struct navit *navit,
 
     if (this->last_state == -1)
     {
-        if (!navit_get_attr(navit, attr_speech, &speechattr, NULL))
-            if (!speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL))
-                attr.u.num = 1;
+        if (!navit_get_attr(navit, attr_speech, &speechattr, NULL) || !speech_get_attr(speechattr.u.speech, attr_active, &attr, NULL))
+            attr.u.num = 1;
         this->active = attr.u.num;
     } else
         this->active = !this->active;