diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-07-14 10:22:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-07-14 20:54:19 +0200 |
| commit | 12fe411cffb4cb7088f6af096b858e0c6c091c54 (patch) | |
| tree | e3c2810518bc5d7f0526ef632050067a3252f408 | |
| parent | 03f1d66a57e7093c85a906bc08e3ce3ee74f81e4 (diff) | |
gtk4: add SolarMutexGuard on entering vcl from gtk
Change-Id: I1f380c5f700b77520ce548963195ce30059f0633
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/customcellrenderer.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/customcellrenderer.cxx b/vcl/unx/gtk3/customcellrenderer.cxx index 7021f8be064c..c43638648dc6 100644 --- a/vcl/unx/gtk3/customcellrenderer.cxx +++ b/vcl/unx/gtk3/customcellrenderer.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <vcl/svapp.hxx> #include "customcellrenderer.hxx" #if !GTK_CHECK_VERSION(4, 0, 0) #include <gtk/gtk-a11y.h> @@ -250,6 +251,9 @@ void custom_cell_renderer_render(GtkCellRenderer* cell, cairo_t* cr, GtkWidget* gpointer pWidget = g_value_get_pointer(&value); if (!pWidget) return; + + SolarMutexGuard aGuard; + custom_cell_renderer_ensure_device(cellsurface, pWidget); Size aSize(cell_area->width, cell_area->height); diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 1ee5072aed7f..f82ab5d105cc 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -17490,6 +17490,7 @@ private: static void signalPopupToggled(GObject*, GParamSpec*, gpointer widget) { GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); + SolarMutexGuard aGuard; pThis->signal_popup_toggled(); } |