diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 10:36:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-07 10:37:30 +0000 |
| commit | 55b81956ab5f0f80a2edf69421164ac74597bfd1 (patch) | |
| tree | 5cfd3281edaa9e0d8e51e8bf90174d045157b6d5 | |
| parent | 0c9c5911b6df0226ef5c8d5465fd02a2bb581eb6 (diff) | |
Resolves: tdf#98425 gtk3: grab the SolarMutex when setting the clipboard
Change-Id: Ic439affbd69532534f5caf82a743786d5975939e
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index d59d2b5b281f..9dab05886997 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2633,7 +2633,7 @@ void Edit::Copy() void Edit::Paste() { - css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); + css::uno::Reference<css::datatransfer::clipboard::XClipboard> aClipboard(GetClipboard()); ImplPaste( aClipboard ); } diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 32e1a5722fac..296c14532380 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -524,6 +524,8 @@ VclGtkClipboard::VclGtkClipboard(GdkAtom nSelection) void VclGtkClipboard::flushClipboard() throw (RuntimeException, std::exception) { + SolarMutexGuard aGuard; + if (GDK_SELECTION_CLIPBOARD != m_nSelection) return; |