[Libreoffice-commits] core.git: fpicker/source

[Michael Stahl]

 fpicker/source/win32/filepicker/asyncrequests.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c18f11587d37f285a95447dd8996c8b605732e00
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jul 1 23:43:12 2015 +0200

    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

diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/filepicker/asyncrequests.cxx
index 87e53fa..089beca 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 );
 }