[GRASS-SVN] r49797 - grass/trunk/raster/r.in.gdal

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-12-17 16:05:33 -0800 (Sat, 17 Dec 2011)
New Revision: 49797

Modified:
   grass/trunk/raster/r.in.gdal/main.c
Log:
+fixme comment, don't need to set the region here, two clearer messages instead of one blurry one for PERMANENT window changes

Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2011-12-17 23:56:53 UTC (rev 49796)
+++ grass/trunk/raster/r.in.gdal/main.c	2011-12-18 00:05:33 UTC (rev 49797)
@@ -611,9 +611,11 @@
     /* -------------------------------------------------------------------- */
     if (flag_e->answer) {
 	if (strcmp(G_mapset(), "PERMANENT") == 0)
+	    /* fixme: expand WIND and DEFAULT_WIND independently. (currently
+		WIND gets forgotten and DEFAULT_WIND is expanded for both) */
 	    G_get_default_window(&cur_wind);
 	else
-	    G_get_set_window(&cur_wind);
+	    G_get_window(&cur_wind);
 
 	cur_wind.north = MAX(cur_wind.north, cellhd.north);
 	cur_wind.south = MIN(cur_wind.south, cellhd.south);
@@ -630,13 +632,10 @@
 
 	if (strcmp(G_mapset(), "PERMANENT") == 0) {
 	    G__put_window(&cur_wind, "", "DEFAULT_WIND");
-	    G_put_window(&cur_wind);
-	    G_message(_("Default and working regions for this location updated"));
+	    G_message(_("Default region for this location updated"));
 	}
-	else {
-	    G_put_window(&cur_wind);
-	    G_message(_("Region for the current mapset updated"));
-	}
+	G_put_window(&cur_wind);
+	G_message(_("Region for the current mapset updated"));
     }
 
     exit(EXIT_SUCCESS);