From: martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Sat, 6 Feb 2010 23:08:45 +0000 (+0000)
Subject: Fix:Core:Correct handling of attribute query
X-Git-Tag: navit-0.5.0.5194svn~2240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bec5c8ebae8bba5dc83fad68b923ef5938650cab;p=profile%2Fivi%2Fnavit.git

Fix:Core:Correct handling of attribute query

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

diff --git a/navit/navit/attr.h b/navit/navit/attr.h
index 5c2ec81..5391018 100644
--- a/navit/navit/attr.h
+++ b/navit/navit/attr.h
@@ -83,6 +83,7 @@ enum attr_position_valid {
 #define ATTR_IS_OBJECT(x) ((x) >= attr_type_object_begin && (x) <= attr_type_object_end)
 #define ATTR_IS_COORD_GEO(x) ((x) >= attr_type_coord_geo_begin && (x) <= attr_type_coord_geo_end)
 #define ATTR_IS_NUMERIC(x) (ATTR_IS_INT(x) || ATTR_IS_DOUBLE(x))
+#define ATTR_IS_COLOR(x) ((x) >= attr_type_color_begin && (x) <= attr_type_color_end)
 
 struct attr {
 	enum attr_type type;
diff --git a/navit/navit/navit.c b/navit/navit/navit.c
index c35df53..38e0b2e 100644
--- a/navit/navit/navit.c
+++ b/navit/navit/navit.c
@@ -1905,7 +1905,8 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
 		break;
 	case attr_mapset:
 		attr->u.mapset=this_->mapsets->data;
-		return (attr->u.mapset != NULL);
+		ret=(attr->u.mapset != NULL);
+		break;
 	case attr_navigation:
 		attr->u.navigation=this_->navigation;
 		break;