Fix:maptool:Another name for faroe islands

[navit-package] / navit / start_real.c

diff --git a/navit/start_real.c b/navit/start_real.c
index e16700a..eae4e9a 100644 (file)
--- a/navit/start_real.c
+++ b/navit/start_real.c
@@ -22,6 +22,7 @@
 #include <glib.h>
 #include <getopt.h>
 #include "config.h"
+#include "config_.h"
 #include "version.h"
 #include "item.h"
 #include "coord.h"
@@ -35,6 +36,8 @@
 #include "xmlconfig.h"
 #include "file.h"
 #include "search.h"
+#include "start_real.h"
+#include "linguistics.h"
 #include "navit_nls.h"
 #include "atom.h"
 #ifdef HAVE_API_WIN32_CE
@@ -43,6 +46,8 @@
 #endif
 
 char *version=PACKAGE_VERSION" "SVN_VERSION""NAVIT_VARIANT; 
+int main_argc;
+char **main_argv;
 
 static void
 print_usage(void)
@@ -57,8 +62,11 @@ int main_real(int argc, char **argv)
        char *config_file = NULL;
        int opt;
        char *cp;
+       struct attr navit;
 
        GList *list = NULL, *li;
+       main_argc=argc;
+       main_argv=argv;
 
 
 #ifdef HAVE_GLIB
@@ -163,7 +171,7 @@ int main_real(int argc, char **argv)
                li = g_list_next(li);
        }
        g_list_free(list);
-       if (! main_get_navit(NULL)) {
+       if (! config_get_attr(config, attr_navit, &navit, NULL) && !config_empty_ok) {
                dbg(0, _("No instance has been created, exiting\n"));
                exit(1);
        }