summaryrefslogtreecommitdiff
path: root/navit
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-12-22 06:31:29 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2009-12-22 06:31:29 +0000
commit8fca9a9539d94c2ced7542f5c4f5b45d27e126c5 (patch)
treee7fcba5b403008d1f84b502ae81dcb66ea3b750a /navit
parent8602f366f2f9d2062545d196c9d92fe40ef377cb (diff)
downloadnavit-8fca9a9539d94c2ced7542f5c4f5b45d27e126c5.tar.gz
Add:Core:Allow empty config
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2888 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
-rw-r--r--navit/config_.c2
-rw-r--r--navit/config_.h1
-rw-r--r--navit/start_real.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/navit/config_.c b/navit/config_.c
index 39a4d3abc..167742833 100644
--- a/navit/config_.c
+++ b/navit/config_.c
@@ -29,6 +29,8 @@ struct config {
struct callback_list *cbl;
} *config;
+int config_empty_ok;
+
struct attr_iter {
void *iter;
};
diff --git a/navit/config_.h b/navit/config_.h
index 9f47e995e..36fc93729 100644
--- a/navit/config_.h
+++ b/navit/config_.h
@@ -1,4 +1,5 @@
extern struct config *config;
+extern int config_empty_ok;
/* prototypes */
enum attr_type;
struct attr;
diff --git a/navit/start_real.c b/navit/start_real.c
index 44f8279c1..97f5a05ae 100644
--- a/navit/start_real.c
+++ b/navit/start_real.c
@@ -167,7 +167,7 @@ int main_real(int argc, char **argv)
li = g_list_next(li);
}
g_list_free(list);
- if (! config_get_attr(config, attr_navit, &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);
}