diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-20 13:26:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-20 13:50:46 +0000 |
| commit | 227ea92266c03adb5faba869c64fa316ebff89f6 (patch) | |
| tree | 572e2aa6a1ceb9310d3b1424af48003d7903e9c1 /vcl/unx/gtk3/gtkdata.cxx | |
| parent | 97ceff5bb949063f118835d67334aedf6d57420c (diff) | |
tdf#153756 Unable to open form wizard (GTK3)
Revert "osl::Mutex->std::mutex in GtkSalData"
This reverts commit acf37c3a0b54a46de29bafd27ec9b0618bd2d84a.
Change-Id: Ifb03dfcab966cdc69fea8c6fc2ba15eedb57d8f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147323
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/gtk3/gtkdata.cxx')
| -rw-r--r-- | vcl/unx/gtk3/gtkdata.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index 1fb5c1edfe1f..cc8535ff2ad2 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -358,7 +358,7 @@ GtkSalData::~GtkSalData() // up anyway before the condition they're waiting on gets destroyed. m_aDispatchCondition.set(); - std::unique_lock g( m_aDispatchMutex ); + osl::MutexGuard g( m_aDispatchMutex ); if (m_pUserEvent) { g_source_destroy (m_pUserEvent); @@ -389,7 +389,7 @@ bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents ) { // release YieldMutex (and re-acquire at block end) SolarMutexReleaser aReleaser; - if( m_aDispatchMutex.try_lock() ) + if( m_aDispatchMutex.tryToAcquire() ) bDispatchThread = true; else if( ! bWait ) { @@ -423,7 +423,7 @@ bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents ) if( bDispatchThread ) { - m_aDispatchMutex.unlock(); + m_aDispatchMutex.release(); if( bWasEvent ) m_aDispatchCondition.set(); // trigger non dispatch thread yields } |