From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Thu, 20 Aug 2009 05:33:59 +0000 (+0000)
Subject: Fix:Core:Fixed osd icons, fixes trac #443
X-Git-Tag: navit-0.5.0.5194svn~2687
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b4781c05ba33c585570a1196e42271e8e27d1bc;p=profile%2Fivi%2Fnavit.git

Fix:Core:Fixed osd icons, fixes trac #443

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

diff --git a/navit/navit/graphics.c b/navit/navit/graphics.c
index 6f4ae1c..f1540cf 100644
--- a/navit/navit/graphics.c
+++ b/navit/navit/graphics.c
@@ -51,7 +51,6 @@
 #include "file.h"
 #include "event.h"
 
-static char *navit_sharedir;
 
 //##############################################################################################################
 //# Description: 
@@ -207,7 +206,6 @@ void graphics_init(struct graphics *this_)
 	graphics_gc_set_background(this_->gc[2], &(struct color) { 0xffff, 0xffff, 0xffff, 0xffff });
 	graphics_gc_set_foreground(this_->gc[2], &(struct color) { 0x0000, 0x0000, 0x0000, 0xffff });
 	graphics_background_gc(this_, this_->gc[0]);
-	navit_sharedir = getenv("NAVIT_SHAREDIR");
 }
 
 /**
@@ -1404,14 +1402,18 @@ get_font(struct graphics *gra, int size)
 char *
 graphics_icon_path(char *icon)
 {
+	static char *navit_sharedir;
 	dbg(1,"enter %s\n",icon);
 	if (icon[0] == '/')
 		return g_strdup(icon);
-	else
+	else {
 #ifdef HAVE_API_ANDROID
 		return g_strdup_printf("res/drawable/%s", icon);
 #else
+		if (! navit_sharedir)
+			navit_sharedir = getenv("NAVIT_SHAREDIR");
 		return g_strdup_printf("%s/xpm/%s", navit_sharedir, icon);
+	}
 #endif
 }