X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=c4d3080805ec3f685b1494a0010b35e990869fbb;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=a649e40abb864e45c5a4e2136a2ffdbf920b3f3d;hpb=8e0c58b2a77c271b485e403cc6edd6ba6e0125cc;p=rocksndiamonds.git

diff --git a/src/libgame/image.c b/src/libgame/image.c
index a649e40a..c4d30808 100644
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -705,7 +705,7 @@ Bitmap *getBitmapFromImageID(int graphic)
 {
   ImageInfo **img_info = (ImageInfo **)image_info->artwork_list;
 
-  return img_info[graphic]->bitmap;
+  return (img_info[graphic] != NULL ? img_info[graphic]->bitmap : NULL);
 }
 
 char *getTokenFromImageID(int graphic)
@@ -739,6 +739,7 @@ void InitImageList(struct ConfigInfo *config_list,
     getFileListFromConfigList(config_list, config_suffix_list,
 			      num_file_list_entries);
   image_info->suffix_list = config_suffix_list;
+  image_info->custom_setup_list = NULL;
 
   image_info->artwork_list =
     checked_calloc(num_file_list_entries * sizeof(ImageInfo *));
@@ -755,6 +756,7 @@ void ReloadCustomImages()
   printf("DEBUG: reloading images '%s' ...\n", artwork.gfx_current_identifier);
 #endif
 
+  LoadArtworkConfig(image_info);
   ReloadCustomArtworkList(image_info);
 }