Fix failure to re-write bad configuration files caused by trying to check for a link...
authorCarl Hetherington <cth@carlh.net>
Mon, 24 Dec 2018 23:55:29 +0000 (23:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 24 Dec 2018 23:55:29 +0000 (23:55 +0000)
src/lib/config.cc

index e2f2bbeb97a81fff2ccbf19ae50798916394cd89..dbd0aea71e171bf755d861518cfe3354d7850ae7 100644 (file)
@@ -970,10 +970,16 @@ Config::config_file ()
        }
 
        /* See if there's a link */
-       f.read_file (main);
-       optional<string> link = f.optional_string_child("Link");
-       if (link) {
-               return *link;
+       try {
+               f.read_file (main);
+               optional<string> link = f.optional_string_child("Link");
+               if (link) {
+                       return *link;
+               }
+       } catch (xmlpp::exception& e) {
+               /* There as a problem reading the main configuration file,
+                  so there can't be a link.
+               */
        }
 
        return main;