diff options
| -rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index 06f3e2cf79d5..97b394175ded 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salplug.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.28 $ * * This file is part of OpenOffice.org. * @@ -454,6 +454,15 @@ SalInstance *CreateSalInstance() if( !(pUsePlugin && *pUsePlugin) ) pInst = check_headless_plugin(); + if( ! pInst ) + { + /* #i90094# + from now on we know that an X connection will be + established, so protect X against itself + */ + XInitThreads(); + } + if( ! pInst && !(pUsePlugin && *pUsePlugin) ) pUsePlugin = autodetect_plugin(); |