vcl/unx/generic/dtrans/X11_selection.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 825e925ee8fb9495a76cba0407f34418f7bddda0
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Aug 28 08:39:26 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Aug 28 13:24:01 2023 +0200
assert seen on closing navigator while dragging
seen when dragging from floating navigator and pressing alt+f4 while
continuing to drag
Change-Id: Idb563c4ec4d8ab74b794e06194ef748e6346eb1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156181
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 493b8943d312..823b77982fdf 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -4007,7 +4007,7 @@ void SelectionManager::registerDropTarget( ::Window
aWindow, DropTarget* pTarget
void SelectionManager::deregisterDropTarget( ::Window aWindow )
{
- osl::ClearableMutexGuard aGuard(m_aMutex);
+ osl::ResettableGuard aGuard(m_aMutex);
m_aDropTargets.erase( aWindow );
if( aWindow != m_aDragSourceWindow || !m_aDragRunning.check() )
@@ -4022,6 +4022,7 @@ void SelectionManager::deregisterDropTarget( ::Window
aWindow )
dte.Source = it->second.m_pTarget->getXWeak();
aGuard.clear();
it->second.m_pTarget->dragExit( dte );
+ aGuard.reset();
}
else if( m_aDropProxy != None && m_nCurrentProtocolVersion >= 0 )
{
@@ -4048,7 +4049,6 @@ void SelectionManager::deregisterDropTarget( ::Window
aWindow )
m_xDragSourceListener.clear();
aGuard.clear();
xListener->dragDropEnd( dsde );
-
}
/*
