diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-13 12:03:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-06-13 17:12:26 +0200 |
| commit | dbc6cffff20ebf5f0cb933d884ac9de404740898 (patch) | |
| tree | 42f03874cf33d2ca5da82c5c133db043a7d927cf /toolkit | |
| parent | 40a3a4f7002a38fa49f4c8d06a5fdd9ab6055e04 (diff) | |
unopkg gui crashes on shutdown
since...
commit e655dc8bbf010e5ef89c32c2ebde56281b323925
Date: Thu May 9 18:24:18 2019 +0100
unipoll: let InitVCL tolerate double init.
which changed InitVCL to return true if it was
already initialized, tricking toolkit into thinking
it was the first one to call InitVCL
Change-Id: I33552a5e2caca909f8d63fbf5f23b9fbc4c2dfbd
Reviewed-on: https://gerrit.libreoffice.org/73957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f597f94c86fd..d67136924f17 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -877,7 +877,7 @@ static void ToolkitWorkerFunction( void* pArgs ) } VCLXToolkit * pTk = static_cast<VCLXToolkit *>(pArgs); - bInitedByVCLToolkit = InitVCL(); + bInitedByVCLToolkit = !IsVCLInit() && InitVCL(); if( bInitedByVCLToolkit ) { UnoWrapper* pUnoWrapper = new UnoWrapper( pTk ); |