diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 91966eefb..c483734f8 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -145,12 +145,10 @@ void Config::read () { if (!have_existing ("config.xml")) { - cout << "No existing config.xml; creating chains.\n"; /* Make a new set of signing certificates and key */ _signer_chain = create_certificate_chain (); /* And similar for decryption of KDMs */ _decryption_chain = create_certificate_chain (); - cout << "Writing config.\n"; write (); return; } @@ -337,16 +335,7 @@ Config::instance () { if (_instance == 0) { _instance = new Config; - try { - _instance->read (); - } catch (exception& e) { - /* configuration load failed; never mind, just - stick with the default. - */ - cerr << "dcpomatic: warning: configuration did not load (" << e.what() << "); using defaults\n"; - } catch (...) { - cerr << "dcpomatic: warning: configuration did not load; using defaults\n"; - } + _instance->read (); } return _instance; |