Merge from savannah/emacs-30

3a76354e09 Adapt last change to non-NS systems
2024-07-24 12:01:02 +08:00 · 2024-07-24 12:01:02 +08:00 · 135ce96f1e
commit 135ce96f1e
parent e673492f74 3a76354e09
1 changed files with 2 additions and 1 deletions
--- a/src/image.c
+++ b/src/image.c
@ -6505,7 +6505,8 @@ xpm_load_image (struct frame *f,
  if (ximg)
    {
      image_destroy_x_image (ximg);
-      image_destroy_x_image (mask_img);
+      if (mask_img)
+	image_destroy_x_image (mask_img);
      image_clear_image (f, img);
    }
  return 0;