summaryrefslogtreecommitdiff
path: root/vcl/source/app/svmain.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-05-09 18:24:18 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-05-10 16:19:34 +0200
commite655dc8bbf010e5ef89c32c2ebde56281b323925 (patch)
tree177b6a6e6143448098ae84703e0c6996ac709e76 /vcl/source/app/svmain.cxx
parent9a78a4a16ff7b9a9d8f22809c5127f6389ec4805 (diff)
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 <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/source/app/svmain.cxx')
-rw-r--r--vcl/source/app/svmain.cxx6
1 files changed, 6 insertions, 0 deletions
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;