From: rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sun, 27 Mar 2011 19:52:24 +0000 (+0000)
Subject: Fix:android:Fixed crash when country is unset.
X-Git-Tag: navit-0.5.0.5194svn~801
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5603af5bd0896c192dfaa61866d38ed81e43257;p=profile%2Fivi%2Fnavit.git

Fix:android:Fixed crash when country is unset.

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

diff --git a/navit/navit/search.c b/navit/navit/search.c
index 10a8ea9..556fdf5 100644
--- a/navit/navit/search.c
+++ b/navit/navit/search.c
@@ -1136,6 +1136,7 @@ search_by_address(struct mapset *ms, const char *addr, int partial, struct jni_o
 	GList *ret = NULL;
 	struct search_list *sl;
 	struct attr attr;
+	struct attr *country = country_default();
 	dbg(0,"enter %s\n",addr);
 	attr.type=attr_country_all;
 	tmp=phrases;
@@ -1148,6 +1149,8 @@ search_by_address(struct mapset *ms, const char *addr, int partial, struct jni_o
 		tmp=g_list_next(tmp);
 	}
 	search_list_search(sl, country_default(), partial);
+	if (country)
+		search_list_search(sl, country, partial);
 	ret=search_address_town(ret, sl, phrases, NULL, partial, jni);
 	
 	g_free(str);