From: Po Lu <luangruo@yahoo.com>
Date: Wed, 24 Jul 2024 03:59:53 +0000 (+0800)
Subject: Adapt last change to non-NS systems
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~637
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a76354e092f291037367b65b24c1963fd0fe31f;p=emacs.git

Adapt last change to non-NS systems

* src/image.c (xpm_load_image): Also check whether mask_img is
NULL.
---

diff --git a/src/image.c b/src/image.c
index f869a95c15d..96280f3ef46 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6508,7 +6508,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;