]> Dogcows Code - chaz/openbox/blobdiff - render/theme.c
missing a {
[chaz/openbox] / render / theme.c
index 2b91e765418f051e3c37cb2ca960ebbcce1312fb..f5af79e98595e408ec9ef28fa89a06b7cd0a04e3 100644 (file)
@@ -80,20 +80,22 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     if (name) {
         if (!parse_load_theme(name, &ps.doc, &root, &ps.path)) {
             g_message("Unable to load the theme '%s'", name);
-            g_message("Falling back to the default theme '%s'",
-                      DEFAULT_THEME);
+            if (allow_fallback)
+                g_message("Falling back to the default theme '%s'",
+                          DEFAULT_THEME);
             /* make it fall back to default theme */
             name = NULL;
         }
     }
-    if (name == NULL && allow_fallback) {
-        if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) {
-            g_message("Unable to load the theme '%s'", DEFAULT_THEME);
+    if (name == NULL) {
+        if (allow_fallback) {
+            if (!parse_load_theme(DEFAULT_THEME, &ps.doc, &root, &ps.path)) {
+                g_message("Unable to load the theme '%s'", DEFAULT_THEME);
+                return NULL;
+            }
+        } else
             return NULL;
-        }
     }
-    if (name == NULL)
-        return NULL;
 
     ps.inst = inst;
 
This page took 0.021921 seconds and 4 git commands to generate.