add:osd: navit tries src="" as an absolute path for osd buttons if it can't find...

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

diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c
index 79953bd..bfaf7a6 100644 (file)
--- a/navit/osd/core/osd_core.c
+++ b/navit/osd/core/osd_core.c
@@ -454,7 +454,12 @@ osd_button_new(struct navit *nav, struct osd_methods *meth,
                dbg(0, "no src\n");
                goto error;
        }
+
        this->src = g_strjoin(NULL, getenv("NAVIT_SHAREDIR"), "/xpm/", attr->u.str, NULL);
+    // TODO make ~ and/or $HOME work too
+    if (!file_exists(this->src))
+        this->src = g_strjoin(NULL, attr->u.str, NULL);
+
        navit_add_callback(nav, this->navit_init_cb = callback_new_attr_1(callback_cast (osd_button_init), attr_navit, this));
 
        return (struct osd_priv *) this;