diff options
| author | sb <sb@openoffice.org> | 2010-04-15 09:27:52 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-15 09:27:52 +0200 |
| commit | dfe232b93f11cafccc9a85273021483bd62d3e29 (patch) | |
| tree | 6fc71e6579371e569f5669aa23dbdd75aade1416 /vcl | |
| parent | 33682d1375407c507230050b537bed0f42708457 (diff) | |
| parent | 47d21f39d34919284ded6aa0a6378e3d8340c346 (diff) | |
sb120: merged in backout from cws/sb118
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/dtrans/X11_selection.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx index 2d63489dac3d..7f205407b21b 100644 --- a/vcl/unx/source/dtrans/X11_selection.cxx +++ b/vcl/unx/source/dtrans/X11_selection.cxx @@ -70,6 +70,7 @@ #include <osl/process.h> #include <comphelper/processfactory.hxx> +#include <vos/mutex.hxx> #define DRAG_EVENT_MASK ButtonPressMask |\ ButtonReleaseMask |\ @@ -3807,7 +3808,10 @@ void SelectionManager::shutdown() throw() */ aGuard.clear(); while (osl_isThreadRunning(m_aThread)) + { + vos::OGuard guard2(Application::GetSolarMutex()); Application::Reschedule(); + } osl_joinWithThread( m_aThread ); osl_destroyThread( m_aThread ); m_aThread = NULL; |