From e95e792c259c182a3ac8a32458677a1b981f0c14 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 6 Jul 2005 08:22:07 +0000
Subject: INTEGRATION: CWS vcl41 (1.22.28); FILE MERGED 2005/06/24 11:34:31 pl
 1.22.28.1: #i49875# shortcut the saveDone message in case of no shutdown
 imminent

---
 vcl/unx/source/app/sm.cxx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'vcl')

diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 5bf9029a205c..fc690b0f7e51 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sm.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: kz $ $Date: 2005-05-31 17:05:13 $
+ *  last change: $Author: obo $ $Date: 2005-07-06 09:22:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -355,6 +355,17 @@ void SessionManagerClient::SaveYourselfProc(
     BuildSmPropertyList();
 #ifdef USE_SM_EXTENSION
     bDocSaveDone = false;
+    /* #i49875# some session managers send a "die" message if the
+     * saveDone does not come early enough for their convenience
+     * this can occasionally happen on startup, especially the first
+     * startup. So shortcut the "not shutting down" case since the
+     * upper layers are currently not interested in that event anyway.
+     */
+    if( ! shutdown )
+    {
+        SessionManagerClient::saveDone();
+        return;
+    }
     Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
     SMprintf( "waiting for save yourself event to be processed\n" );
 #endif
-- 
cgit