vcl/source/treelist/transfer.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 80c9fae6aa8638e192e5b622d12305b304890b43
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri May 29 10:53:47 2020 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat May 30 20:49:16 2020 +0200
tdf#133365: only release solar mutex on Windows
Regression after f2561331534459f8aebc57e8615fa5f626521bcb
Change-Id: Id12a81b2ca79edb7ae056b357dcfd1d8f4bb56ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95088
Tested-by: Jenkins
Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Jean-Baptiste Faure <jbfa...@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/source/treelist/transfer.cxx b/vcl/source/treelist/transfer.cxx
index 965d820e331e..8ff088d05366 100644
--- a/vcl/source/treelist/transfer.cxx
+++ b/vcl/source/treelist/transfer.cxx
@@ -1442,9 +1442,12 @@ Any TransferableDataHelper::GetAny( const DataFlavor&
rFlavor, const OUString& r
{
if( ( nRequestFormat == format.mnSotId ) &&
!rFlavor.MimeType.equalsIgnoreAsciiCase( format.MimeType ) )
{
+// tdf#133365: only release solar mutex on Windows
+#ifdef _WIN32
// Our own thread may handle the nested
IDataObject::GetData call,
// and try to acquire solar mutex
SolarMutexReleaser r;
+#endif // _WIN32
if (xTransfer2.is())
aRet = xTransfer2->getTransferData2(format,
rDestDoc);
@@ -1459,9 +1462,12 @@ Any TransferableDataHelper::GetAny( const DataFlavor&
rFlavor, const OUString& r
if( !aRet.hasValue() )
{
+// tdf#133365: only release solar mutex on Windows
+#ifdef _WIN32
// Our own thread may handle the nested IDataObject::GetData
call,
// and try to acquire solar mutex
SolarMutexReleaser r;
+#endif // _WIN32
if (xTransfer2.is())
aRet = xTransfer2->getTransferData2(rFlavor, rDestDoc);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
