diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:08:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-18 09:08:21 +0000 |
| commit | aa767c11da80a32e50feb24408168c0973059a93 (patch) | |
| tree | acbca22e9f1ca4f4a8a4a761429e6f60b4a0cda0 /vcl/source | |
| parent | 149c8e6d31f854fe530cfdf32e2fb3380b8eb7b6 (diff) | |
INTEGRATION: CWS wot02 (1.48.32); FILE MERGED
2006/05/15 13:13:21 pl 1.48.32.1: #135437# prevent creation of default window while already closing shop
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svdata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 680c9b85ccdf..2cf6bb5d2353 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svdata.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: rt $ $Date: 2006-05-04 15:10:53 $ + * last change: $Author: vg $ $Date: 2006-05-18 10:08:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -236,7 +236,7 @@ Window* ImplGetDefaultWindow() // Test again because the thread who released the solar mutex could have called // the same method - if ( !pSVData->mpDefaultWin ) + if ( !pSVData->mpDefaultWin && !pSVData->mbDeInit ) { DBG_WARNING( "ImplGetDefaultWindow(): No AppWindow" ); pSVData->mpDefaultWin = new WorkWindow( 0, WB_DEFAULTWIN ); |