[GRASS-SVN] r45826 - grass/trunk/lib/gis

[svn_grass at osgeo.org]

Author: hamish
Date: 2011-04-02 21:11:46 -0700 (Sat, 02 Apr 2011)
New Revision: 45826

Modified:
   grass/trunk/lib/gis/error.c
Log:
respect the error log file (merge from devbr6)

Modified: grass/trunk/lib/gis/error.c
===================================================================
--- grass/trunk/lib/gis/error.c	2011-04-03 04:08:50 UTC (rev 45825)
+++ grass/trunk/lib/gis/error.c	2011-04-03 04:11:46 UTC (rev 45826)
@@ -3,7 +3,7 @@
  * 
  * \brief GIS Library - Error messages functions
  *
- * (C) 1999-2009, 2011 by the GRASS Development Team
+ * (C) 1999-2011 by the GRASS Development Team
  *
  * This program is free software under the GNU General Public
  * License (>=v2). Read the file COPYING that comes with GRASS
@@ -272,14 +272,14 @@
     else {
 	G_init_logging();
 	format = G_info_format();
+
+	if (type == WARN || type == ERR)
+	    log_error(msg, fatal);
+
 	if (format == G_INFO_FORMAT_SILENT)
 	    return;
-	
+
 	if (format != G_INFO_FORMAT_GUI) {
-	    if (type == WARN || type == ERR) {
-		log_error(msg, fatal);
-	    }
-
 	    if (format != G_INFO_FORMAT_PLAIN) {
 		char *w;
 		int len, lead;
@@ -305,7 +305,7 @@
 		mail_msg(msg, fatal);
 	    }
 	}
-	else {			/* GUI */
+	else {	/* GUI */
 	    print_sentence(stderr, type, msg);
 	}
     }