projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaf903d
)
fixed error exit when loading empty artwork config file in verbose mode
author
Holger Schemel
<info@artsoft.org>
Sun, 6 Dec 2015 15:59:44 +0000
(16:59 +0100)
committer
Holger Schemel
<info@artsoft.org>
Sun, 6 Dec 2015 15:59:44 +0000
(16:59 +0100)
src/libgame/misc.c
patch
|
blob
|
history
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index 8a1a011e267a89bf40e6b3c24a2d06bcb24238ba..7d5268c21a41c7af4d63812c01dd2149d64d1635 100644
(file)
--- 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)
{