diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-01 23:43:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-02 00:00:08 +0200 |
| commit | c18f11587d37f285a95447dd8996c8b605732e00 (patch) | |
| tree | 60612c6748e85117d9d2000d83cbd9046f9ba648 /fpicker | |
| parent | d9c476bfbb4a8f1858c072d2fba33aa9e8e0ae92 (diff) | |
tdf#92460: fpicker: fix VistaFilePicker using SolarMutexReleaser
... on a thread that doesn't ever lock SolarMutex. Assume that
Request::wait(), eventually called by UNO methods via
AsyncRequests::triggerRequestThreadAware(), is called by the UI thread
with the SolarMutex held.
Change-Id: Ie3e6f32ed68e48f8c67d80cd9d2ce2f79e4578d8
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/filepicker/asyncrequests.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx index 87e53fac2c48..089beca54d4a 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.cxx +++ b/fpicker/source/win32/filepicker/asyncrequests.cxx @@ -28,8 +28,6 @@ namespace vista{ static void lcl_sleep( ::osl::Condition& aCondition, ::sal_Int32 nMilliSeconds ) { - SolarMutexReleaser aReleaser; - if (nMilliSeconds < 1) aCondition.wait(0); else @@ -43,6 +41,8 @@ static void lcl_sleep( ::osl::Condition& aCondition, void Request::wait( ::sal_Int32 nMilliSeconds ) { + SolarMutexReleaser aReleaser; + lcl_sleep( m_aJoiner, nMilliSeconds ); } |