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

widgets: Confirm image is indexed before setting entry

Browse source 
It is possible to have an indexed image open
in one tab, and RGB/grayscale images open
in others. If you have the color editor open
and swap between them, you'll receive a
CRITICAL because the ColorMapEditor will
always try to update a color entry even if
the active image is not indexed.

This patch adds checks to ensure you have
the indexed image open before trying to update
its color entry.
This commit is contained in:
Alx Sa 2025-06-24 14:38:20 +00:00
parent 5baabdb4b2
commit 1c71e30cd0
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/widgets/gimpcolordialog.c
View file

@ -386,9 +386,13 @@ gimp_color_dialog_response (GtkDialog *gtk_dialog,
/* Restore old color for undo */
old_color = gimp_color_selection_get_old_color (GIMP_COLOR_SELECTION (dialog->selection));
gimp_image_set_colormap_entry (image, col_index, old_color, FALSE);
gimp_image_set_colormap_entry (image, col_index, color, TRUE);
gimp_image_flush (image);
if (gimp_image_get_base_type (image) == GIMP_INDEXED)
{
gimp_image_set_colormap_entry (image, col_index, old_color, FALSE);
gimp_image_set_colormap_entry (image, col_index, color, TRUE);
gimp_image_flush (image);
}
gtk_stack_set_visible_child_name (GTK_STACK (dialog->stack), "colormap");
g_signal_emit (dialog, color_dialog_signals[UPDATE], 0,
@ -412,8 +416,11 @@ gimp_color_dialog_response (GtkDialog *gtk_dialog,
{
dialog->colormap_editing = FALSE;
gimp_image_set_colormap_entry (image, col_index, color, FALSE);
gimp_projection_flush (gimp_image_get_projection (image));
if (gimp_image_get_base_type (image) == GIMP_INDEXED)
{
gimp_image_set_colormap_entry (image, col_index, color, FALSE);
gimp_projection_flush (gimp_image_get_projection (image));
}
gtk_stack_set_visible_child_name (GTK_STACK (dialog->stack), "colormap");
g_signal_emit (dialog, color_dialog_signals[UPDATE], 0,
@ -683,7 +690,8 @@ gimp_color_dialog_color_changed (GimpColorSelection *selection,
g_object_unref (old_color);
}
gimp_image_set_colormap_entry (image, col_index, color, push_undo);
if (gimp_image_get_base_type (image) == GIMP_INDEXED)
gimp_image_set_colormap_entry (image, col_index, color, push_undo);
if (push_undo)
gimp_image_flush (image);

3
app/widgets/gimpcolormapeditor.c
View file

@ -384,7 +384,8 @@ gimp_colormap_editor_color_update (GimpColorDialog *dialog,
break;
}
if (image)
if (image &&
gimp_image_get_base_type (image) == GIMP_INDEXED)
{
gint col_index;