dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: make sure gimp_ui_manager_update() is run from the main thread.

Browse source 
This GTK widget code could be reach from a thread calling gimp_image_flush().
Yet all GUI-related code must happen in the main thread (also even though
actions are not GTK code anymore, they can trigger GUI updates).

No issue happened from this so far (that we know of), but a trace by SBDaule for
their growing layer project showed that we'd reach this code if calling
gimp_image_flush() from the paint thread.
This commit is contained in:
Jehan 2023-07-09 23:10:57 +02:00
parent e465e867c1
commit 54b22c717a
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/widgets/gimpitemtreeview.c
View file

@ -140,6 +140,8 @@ static void gimp_item_tree_view_real_set_image (GimpItemTreeView *view,
static void gimp_item_tree_view_image_flush (GimpImage *image,
gboolean invalidate_preview,
GimpItemTreeView *view);
static gboolean
gimp_item_tree_view_image_flush_idle (gpointer user_data);
static void gimp_item_tree_view_set_container (GimpContainerView *view,
GimpContainer *container);
@ -1063,7 +1065,23 @@ gimp_item_tree_view_image_flush (GimpImage *image,
gboolean invalidate_preview,
GimpItemTreeView *view)
{
g_idle_add_full (G_PRIORITY_LOW,
(GSourceFunc) gimp_item_tree_view_image_flush_idle,
g_object_ref (view), g_object_unref);
}
static gboolean
gimp_item_tree_view_image_flush_idle (gpointer user_data)
{
GimpItemTreeView *view = user_data;
/* This needs to be run as idle because we want this to be run in the main
* thread even when the flush happened in a thread (e.g. from the paint
* thread).
*/
gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (view)), view);
return G_SOURCE_REMOVE;
}