[Xfce4-commits] <xfwm4:master> Only load the session if Xfwm4 was restored.

[Nick Schermer]

Updating branch refs/heads/master
         to dc3cf0745cc0e94289b9cfeebd3a1b4adc2ae04d (commit)
       from e08b248a5cec4ecf161a9a37642650ee48d3423b (commit)

commit dc3cf0745cc0e94289b9cfeebd3a1b4adc2ae04d
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Nov 26 16:02:38 2010 +0100

    Only load the session if Xfwm4 was restored.

 src/session.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/session.c b/src/session.c
index 257f89f..70c8576 100644
--- a/src/session.c
+++ b/src/session.c
@@ -767,7 +767,8 @@ sessionStart (DisplayInfo *display_info)
     {
         display_info->session = session;
 
-        sessionLoad (display_info);
+        if (xfce_sm_client_is_resumed (session))
+            sessionLoad (display_info);
 
         /* save-state-extended is special for window managers to store
          * the window positions of all the clients */