diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 14:07:06 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 14:07:06 +0200 |
| commit | e7a16859aec4381fd02b1f7b157c7c5f57ac185b (patch) | |
| tree | 337f8f4fd1f59ffef37e341ae447bcef2aaf3b98 /vcl | |
| parent | 65007b34e4b936be783a6a697ecab726a7f6ebdf (diff) | |
| parent | d18de1ac029a718f36afd501b73a774901c06e8a (diff) | |
CWS-TOOLING: integrate CWS sb120
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; |