[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue May 19 07:53:41 UTC 2020


 vcl/unx/generic/dtrans/X11_selection.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 206ccbad07b459fa93db5c783d6b65eef60f7629
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 15 10:28:03 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Tue May 19 09:53:11 2020 +0200

    tdf#133053 reset after clear so avoid later assert
    
    Change-Id: Ib2b637c8a6d5af04256bfd9631e43d334343b610
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94265
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 773b8e3cc1340e6f5bfc364f0705344b744edd8d)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94273
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index e9c00d0174fb..dc5824338cb2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -2626,6 +2626,7 @@ bool SelectionManager::handleDragEvent( XEvent const & rMessage )
                 dte.Source = static_cast< OWeakObject* >( it->second.m_pTarget );
                 aGuard.clear();
                 it->second.m_pTarget->dragExit( dte );
+                aGuard.reset();
             }
             else if( m_aDropProxy != None && m_nCurrentProtocolVersion >= 0 )
             {


More information about the Libreoffice-commits mailing list