changeset 1262:dc9b20d77bc9

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 21 May 2015 13:41:38 +0300
parents 2bf7cb1e662f (diff) 94e9444b0fa7 (current diff)
children 4e9deb14e67f aa6e8a24b94b
files
diffstat 1 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmengine.c	Tue Mar 10 11:49:38 2015 +0200
+++ b/src/dmengine.c	Thu May 21 13:41:38 2015 +0300
@@ -333,9 +333,16 @@
         return NULL;
     }
 
-    if ((res = dmResourceFind(eng->resources, name)) != NULL &&
-        res->resData != NULL)
-        return res->resData;
+    if ((res = dmResourceFind(eng->resources, name)) != NULL)
+    {
+        if (res->resData != NULL)
+            return res->resData;
+
+        dmErrorDBGMsg(
+            "Could not find resource DATA '%s' (resource was not preloaded).\n",
+            name);
+        return NULL;
+    }
     else
     {
         dmErrorDBGMsg(