Fixe:Core:avoid using geo_attr in wrong order, ticket #510

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

diff --git a/navit/navit/navit.c b/navit/navit/navit.c
index 3499620..541bfda 100644 (file)
--- a/navit/navit/navit.c
+++ b/navit/navit/navit.c
@@ -2279,13 +2279,13 @@ navit_layout_switch(struct navit *n)
        }
        if (sscanf(iso8601_attr.u.str,"%d-%02d-%02dT",&year,&month,&day) != 3)
                return;
+       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_valid, &valid_attr,NULL) && valid_attr.u.num==attr_position_valid_invalid) {
+               return; //No valid fix yet
+       }
        if (vehicle_get_attr(n->vehicle->vehicle, attr_position_coord_geo,&geo_attr,NULL)!=1) {
                //No position - no sun
                return;
        }
-       if (vehicle_get_attr(n->vehicle->vehicle, attr_position_valid, &valid_attr,NULL) && valid_attr.u.num==attr_position_valid_invalid) {
-               return; //No valid fix yet
-       }
        
        //We calculate sunrise anyway, cause it is needed both for day and for night
         if (__sunriset__(year,month,day,geo_attr.u.coord_geo->lng,geo_attr.u.coord_geo->lat,-5,1,&trise,&tset)!=0) {