From e655dc8bbf010e5ef89c32c2ebde56281b323925 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 9 May 2019 18:24:18 +0100 Subject: unipoll: let InitVCL tolerate double init. We need to get VCL initialized early in UniPoll mode, since the main setup doesn't occur until runPoll is invoked, and we want to call lots of virtual methods that take the SolarMutex before then - which requires VCL to be initialized. Change-Id: Id9c1b74c126cf7bb71d6560b7585d37327a9f5ef Reviewed-on: https://gerrit.libreoffice.org/72071 Tested-by: Jenkins Reviewed-by: Michael Meeks --- vcl/source/app/svmain.cxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'vcl') diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 9372e74afc17..16b83439751b 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -294,6 +294,12 @@ namespace vclmain bool InitVCL() { + if (isInitVCL()) + { + SAL_INFO("vcl.app", "Double initialization of vcl"); + return true; + } + if( pExceptionHandler != nullptr ) return false; -- cgit