Fix config handling (stupid mismatch was causing the getter for the

config options to always fail).

Move the default config stuff from libstate to the config object.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/init_def.cpp b/src/init_def.cpp
index 26e759120..2edd43b97 100644
--- a/src/init_def.cpp
+++ b/src/init_def.cpp
@@ -50,13 +50,11 @@ void initialize(const std::string& arg_string)
       }
 
    set_global_state(new Library_State(mutex_factory));
-   global_state().set_default_policy();
-
-   global_state().load(modules);
-
+   global_state().config().load_defaults();
    if(args.config_file() != "")
       global_config().load_inifile(args.config_file());
 
+   global_state().load(modules);
    global_state().set_transcoder(new Default_Charset_Transcoder);
    global_state().set_prng(new ANSI_X931_RNG);