fixed potential crash bug for special versions without "classic" artwork

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index c64c95c8ee84c6d5fdb17d6b110eaded193a01a7..22fd408408e767508e4e336cd0cdf39781adb864 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -3967,8 +3967,17 @@ TreeInfo *getArtworkTreeInfoForUserLevelSet(int type)
 {
   char *artwork_set = getArtworkIdentifierForUserLevelSet(type);
   TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);
 {
   char *artwork_set = getArtworkIdentifierForUserLevelSet(type);
   TreeInfo *artwork_first_node = ARTWORK_FIRST_NODE(artwork, type);

+  TreeInfo *ti = getTreeInfoFromIdentifier(artwork_first_node, artwork_set);

 
 

-  return getTreeInfoFromIdentifier(artwork_first_node, artwork_set);
+  if (ti == NULL)
+  {
+    ti = getTreeInfoFromIdentifier(artwork_first_node,
+                                  ARTWORK_DEFAULT_SUBDIR(type));
+    if (ti == NULL)
+      Error(ERR_EXIT, "cannot find default graphics -- should not happen");
+  }
+
+  return ti;

 }
 
 boolean checkIfCustomArtworkExistsForCurrentLevelSet(void)
 }
 
 boolean checkIfCustomArtworkExistsForCurrentLevelSet(void)