diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-08 11:56:03 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-08 16:06:21 +0100 |
| commit | ca9526f42a1eac5aa3ff801e017636ca0e618ebd (patch) | |
| tree | 54f5dc394842768b3a99cbd2f4138fe328d452ac | |
| parent | 65197e46df544dd0f2c28fa245b1810bab98b519 (diff) | |
Resolves: tdf#114766 gtk3 solar mutex assert
since
commit 33de587e95dddfc8e3c89b84f90b3d1bca823dae
Date: Tue Mar 17 12:56:54 2015 +0530
tdf#88230: cleanup solar mutex yielding
Use SolarMutexReleaser, instead.
Change-Id: Ied2c78f95592c87b7908d14e9ab6c78e62f987e7
Reviewed-on: https://gerrit.libreoffice.org/47591
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | basctl/source/dlged/dlged.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index d112a9636609..a6239a40a0a0 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -822,7 +822,6 @@ void DlgEditor::Paste() if ( xClipboard.is() ) { Reference< datatransfer::XTransferable > xTransf; - { SolarMutexReleaser aReleaser; // get clipboard content @@ -1051,11 +1050,14 @@ bool DlgEditor::IsPasteAllowed() Reference< datatransfer::clipboard::XClipboard > xClipboard = GetWindow().GetClipboard(); if ( xClipboard.is() ) { - // get clipboard content - SolarMutexReleaser aReleaser; - Reference< datatransfer::XTransferable > xTransf = xClipboard->getContents(); - - return xTransf.is() && xTransf->isDataFlavorSupported( m_ClipboardDataFlavors[0] ); + Reference< datatransfer::XTransferable > xTransf; + { + SolarMutexReleaser aReleaser; + // get clipboard content + xTransf = xClipboard->getContents(); + } + if (xTransf.is()) + return xTransf->isDataFlavorSupported(m_ClipboardDataFlavors[0]); } return false; } |