diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-08-25 12:56:25 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-08-25 12:56:25 +0000 |
| commit | f64fa109d56b21a23ba8c9426b0af3957f382195 (patch) | |
| tree | 7a34a13efbfa79f3fbb60fcd0bbf8295c528c231 /vcl | |
| parent | cd468bd6ab6a09127b4b554c30df8ed717262ebf (diff) | |
INTEGRATION: CWS vcl15 (1.12.26); FILE MERGED
2003/08/06 08:09:58 pl 1.12.26.2: corrected wrong const'ness
2003/07/22 09:29:10 pl 1.12.26.1: #110842# cleaned up shutdown sequence
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/sm.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx index 9033c97427d0..6bb8b6820fc2 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.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hjs $ $Date: 2003-08-18 15:16:54 $ + * last change: $Author: kz $ $Date: 2003-08-25 13:56:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -403,6 +403,9 @@ void SessionManagerClient::close() { ICEConnectionObserver::deactivate(); #ifdef USE_SM_EXTENSION + // shut down the listening thread + ICEConnectionObserver::deactivate(); + // close the connection SmcCloseConnection( aSmcConnection, 0, NULL ); SMprintf( "SmcConnection closed\n" ); #endif @@ -481,6 +484,7 @@ void ICEConnectionObserver::deactivate() ICEThread = NULL; } osl_destroyMutex( ICEMutex ); + ICEMutex = NULL; } } |