desktop/source/app/app.cxx | 19 ++++++-------------
vcl/source/helper/threadex.cxx | 2 +-
2 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit d6fa091a75eaf665ec734a56ef1e10b72bc603dd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Dec 21 10:12:57 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 21 10:40:33 2021 +0100
no point in release solar mutex before calling PostUserEvent
which will just acquire it gain
Change-Id: I62b0d43e15f93994a53d64b24f9765c5e7b676ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127213
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b254c927fd10..be4360ed560d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1567,20 +1567,13 @@ int Desktop::Main()
// Reap the process started by fire_glxtest_process().
reap_glxtest_process();
- // Release solar mutex just before we wait for our client to connect
- {
- SolarMutexReleaser aReleaser;
-
- // Post user event to startup first application component window
- // We have to send this OpenClients message short before execute()
to
- // minimize the risk that this message overtakes type detection
construction!!
- Application::PostUserEvent( LINK( this, Desktop, OpenClients_Impl
) );
+ // Post user event to startup first application component window
+ // We have to send this OpenClients message short before execute() to
+ // minimize the risk that this message overtakes type detection
construction!!
+ Application::PostUserEvent( LINK( this, Desktop, OpenClients_Impl ) );
- // Post event to enable acceptors
- Application::PostUserEvent( LINK( this, Desktop,
EnableAcceptors_Impl) );
-
- // Acquire solar mutex just before we enter our message loop
- }
+ // Post event to enable acceptors
+ Application::PostUserEvent( LINK( this, Desktop, EnableAcceptors_Impl)
);
// call Application::Execute to process messages in vcl message loop
#if HAVE_FEATURE_JAVA
commit 4b83a4131ff6f2ddf457f6a2754d491722d3e2dc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Dec 21 10:12:38 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 21 10:40:18 2021 +0100
no point in release solar mutex before calling PostUserEvent
which will just acquire it again
Change-Id: If483a74ccac762f288bcd05956066ce726a96516
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127212
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index 1d55ddc08562..cbd342bd28df 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.cxx
@@ -51,8 +51,8 @@ void SolarThreadExecutor::execute()
{
m_aStart.reset();
m_aFinish.reset();
- SolarMutexReleaser aReleaser;
ImplSVEvent* nEvent = Application::PostUserEvent(LINK(this,
SolarThreadExecutor, worker));
+ SolarMutexReleaser aReleaser;
if (m_aStart.wait() == osl::Condition::result_timeout)
{
m_bTimeout = true;
