[GRASS-SVN] r69005 - grass/trunk/display/d.barscale

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-07-18 08:15:08 -0700 (Mon, 18 Jul 2016)
New Revision: 69005

Modified:
   grass/trunk/display/d.barscale/main.c
Log:
d.barscale: fix handling units from location

Modified: grass/trunk/display/d.barscale/main.c
===================================================================
--- grass/trunk/display/d.barscale/main.c	2016-07-18 15:12:38 UTC (rev 69004)
+++ grass/trunk/display/d.barscale/main.c	2016-07-18 15:15:08 UTC (rev 69005)
@@ -256,10 +256,10 @@
         label = "ft";
     }
     else {
-        if (!units_opt->answer){
-            units = G_projection_units(G_projection());
-        }
-        units = G_units(units_opt->answer);
+        if (!units_opt->answer)
+            units = G_database_unit();
+        else
+            units = G_units(units_opt->answer);
         switch (units) {
         case U_METERS:
             label = "m";