Move most of the resource loading code into ResourceManager_base

I mostly do this to avoid code duplication between fluxbox and fluxbox-update_configs.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 1dc3105..c7f6ee2 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1151,7 +1151,13 @@ string Fluxbox::getDefaultDataFilename(const char *name) const {
 /// loads resources
 void Fluxbox::load_rc() {
 
-    m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE);
+    try {
+        m_resourcemanager.load(getRcFilename(), DEFAULT_INITFILE);
+    }
+    catch(std::runtime_error &) {
+        // This should only happen if system-wide init file is broken.
+        // Not much we can do about that, so we just ignore it
+    }
 
     if (m_rc_menufile->empty())
         m_rc_menufile.setDefaultValue();