procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

actions: Prevent crash due to non-existent editors

Browse source 
Resolves #10914

Some dockables such as "gimp-pattern-editor" and
"gimp-mybrush-editor" are listed as Editors even though
we don't yet have dedicated GimpDataEditors for them.
This causes problems when using certain features like
duplicating. To resolve for now, we check if
gimp_window_strategy_show_dockable_dialog () returns a
valid GimpDataEditor before trying to use it.
Per Jehan, we also verify that an edit button exists
and is visible before we try to call the edit command.
This commit is contained in:
Alx Sa 2024-04-21 23:18:17 +00:00
parent 2f9881c03f
commit c691bd2a0b
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/actions/data-commands.c
View file

@ -116,11 +116,15 @@ data_new_cmd_callback (GimpAction *action,
if (data)
{
GtkWidget *edit_button;
gimp_context_set_by_type (context,
gimp_data_factory_view_get_children_type (view),
GIMP_OBJECT (data));
gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
edit_button = gimp_data_factory_view_get_edit_button (view);
if (edit_button && gtk_widget_get_visible (edit_button))
gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
}
}
}
@ -148,11 +152,15 @@ data_duplicate_cmd_callback (GimpAction *action,
if (new_data)
{
GtkWidget *edit_button;
gimp_context_set_by_type (context,
gimp_data_factory_view_get_children_type (view),
GIMP_OBJECT (new_data));
gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
edit_button = gimp_data_factory_view_get_edit_button (view);
if (edit_button && gtk_widget_get_visible (edit_button))
gtk_button_clicked (GTK_BUTTON (gimp_data_factory_view_get_edit_button (view)));
}
}
}
@ -286,6 +294,7 @@ data_edit_cmd_callback (GimpAction *action,
{
GdkMonitor *monitor = gimp_widget_get_monitor (GTK_WIDGET (view));
GtkWidget *dockable;
GtkWidget *editor = NULL;
dockable =
gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
@ -295,7 +304,10 @@ data_edit_cmd_callback (GimpAction *action,
g_variant_get_string (value,
NULL));
gimp_data_editor_set_data (GIMP_DATA_EDITOR (gtk_bin_get_child (GTK_BIN (dockable))),
data);
if (dockable)
editor = gtk_bin_get_child (GTK_BIN (dockable));
if (editor && GIMP_IS_DATA_EDITOR (editor))
gimp_data_editor_set_data (GIMP_DATA_EDITOR (editor), data);
}
}