summaryrefslogtreecommitdiff
path: root/navit/search.c
diff options
context:
space:
mode:
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-03-27 19:52:24 +0000
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-03-27 19:52:24 +0000
commit19fa5ece25fe126f1a35b1b32fc656da32e04523 (patch)
tree7d31bb564dfb3b3ce6a4f323dc727a2393d6b9bc /navit/search.c
parentbe259580afb7f48b104e271349da4a3a5abe402f (diff)
downloadnavit-svn-19fa5ece25fe126f1a35b1b32fc656da32e04523.tar.gz
Fix:android:Fixed crash when country is unset.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4394 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/search.c')
-rw-r--r--navit/search.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/navit/search.c b/navit/search.c
index 10a8ea93..556fdf54 100644
--- a/navit/search.c
+++ b/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);