save the frame decorations in client_configure_full before causing the fake frame...

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index aa8054e861fe2d2f48eefaff3f0c960a6fc292c2..50234509cf49c59e969f2bd3838d54391d7fd7c9 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -941,19 +941,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
     XrmDatabase db;
 
-    char *s = g_build_filename(name, "themerc", NULL);
+    char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+                               name, "themerc", NULL);
     if ((db = XrmGetFileDatabase(s)))
         theme->path = g_path_get_dirname(s);
     g_free(s);
     if (db == NULL) {
-       char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                                  name, "themerc", NULL);
+       char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
        g_free(s);
     }
     if (db == NULL) {
-       char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
+        char *s = g_build_filename(name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
         g_free(s);