[Navit-cvs-commit] navit/src main.c,1.17,1.18

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29100

Modified Files:
	main.c 
Log Message:
Fix Ticket #30 - exit gracefuly when no config file or config file is invalid

Index: main.c
===================================================================
RCS file: /cvsroot/navit/navit/src/main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** main.c	3 Oct 2007 13:47:32 -0000	1.17
--- main.c	27 Nov 2007 09:29:39 -0000	1.18
***************
*** 167,174 ****
  		}
  	}
! 	if (! config_file) 
! 		g_error(_("No config file navit.xml or navit.xml.local found\n"));
  	if (!config_load(config_file, &error)) {
! 		g_error(_("Error parsing '%s': %s\n"), config_file, error->message);
  	} else {
  		printf(_("Using '%s'\n"), config_file);
--- 167,177 ----
  		}
  	}
! 	if (!config_file) {
! 		printf(_("No config file navit.xml, navit.xml.local found\n"));
! 		exit(1);
! 	}
  	if (!config_load(config_file, &error)) {
! 		printf(_("Error parsing '%s': %s\n"), config_file, error->message);
! 		exit(1);
  	} else {
  		printf(_("Using '%s'\n"), config_file);