X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=1e1e3bf0f5f6268478525550ba043c8cb46ecd42;hb=15e6775b0c17220b81456188757362d131a436c8;hp=42a062bef5a85d2e12b7649361c20af921144bd2;hpb=c726a1f709484da690a6fbcc7f6b8b4934660290;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 42a062be..1e1e3bf0 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -261,7 +261,7 @@ gint main(gint argc, gchar **argv)
             /* load the theme specified in the rc file */
             {
                 RrTheme *theme;
-                if ((theme = RrThemeNew(ob_rr_inst, config_theme,
+                if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE,
                                         config_font_activewindow,
                                         config_font_inactivewindow,
                                         config_font_menutitle,
@@ -275,7 +275,7 @@ gint main(gint argc, gchar **argv)
                     ob_exit_with_error(_("Unable to load a theme."));
 
                 PROP_SETS(RootWindow(ob_display, ob_screen),
-                          ob_theme, theme->name);
+                          ob_theme, ob_rr_theme->name);
             }
 
             if (reconfigure) {
@@ -330,10 +330,14 @@ gint main(gint argc, gchar **argv)
                 /* redecorate all existing windows */
                 for (it = client_list; it; it = g_list_next(it)) {
                     ObClient *c = it->data;
+
                     /* the new config can change the window's decorations */
-                    client_setup_decor_and_functions(c, TRUE);
+                    client_setup_decor_and_functions(c, FALSE);
                     /* redraw the frames */
                     frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+                    /* the decor sizes may have changed, so the windows may
+                       end up in new positions */
+                    client_reconfigure(c, FALSE);
                 }
             }