From: Dana Jansens <danakj@orodu.net>
Date: Thu, 12 Apr 2007 14:54:54 +0000 (+0000)
Subject: saved session information overrides per-app settings, because that's how you set... 
X-Git-Tag: openbox-3_3_991-RELEASE~150^2~287
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=64dda2375e4d01ca2e81638c1e9595cb73654883;p=dana%2Fopenbox.git

saved session information overrides per-app settings, because that's how you set it up in the session
---

diff --git a/openbox/client.c b/openbox/client.c
index 9c6c74bd..7f4cba21 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -275,10 +275,11 @@ void client_manage(Window window)
     self->user_time = client_last_user_time;
 
     client_get_all(self);
-    client_restore_session_state(self);
     /* per-app settings override stuff, and return the settings for other
        uses too */
     settings = client_get_settings_state(self);
+    /* the session should get the last say */
+    client_restore_session_state(self);
 
     client_calc_layer(self);