From: Holger Schemel <info@artsoft.org>
Date: Sun, 6 Dec 2015 15:59:44 +0000 (+0100)
Subject: fixed error exit when loading empty artwork config file in verbose mode
X-Git-Tag: 4.0.0.0-rc1~116
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=35d0e139cd9e01e6f12ecb8b3802d709c821694c;p=rocksndiamonds.git

fixed error exit when loading empty artwork config file in verbose mode
---

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 8a1a011e..7d5268c2 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -3276,8 +3276,8 @@ static void LoadArtworkConfigFromFilename(struct ArtworkListInfo *artwork_info,
     boolean unknown_tokens_found = FALSE;
     boolean undefined_values_found = (hashtable_count(empty_file_hash) != 0);
 
-    if ((setup_file_list = loadSetupFileList(filename)) == NULL)
-      Error(ERR_EXIT, "loadSetupFileHash works, but loadSetupFileList fails");
+    /* list may be NULL for empty artwork config files */
+    setup_file_list = loadSetupFileList(filename);
 
     BEGIN_HASH_ITERATION(extra_file_hash, itr)
     {