# HG changeset patch # User Matti Hamalainen # Date 1366563788 -10800 # Node ID b505b81a43de98de520ae1cca968d60c549bfd30 # Parent 2f02d9b4caa3c2ce349963e9818161a5fdda608a Fix resource loading. diff -r 2f02d9b4caa3 -r b505b81a43de dmres.c --- a/dmres.c Sun Apr 21 19:58:59 2013 +0300 +++ b/dmres.c Sun Apr 21 20:03:08 2013 +0300 @@ -610,7 +610,7 @@ */ static int dmResourcePreload(DMResource *handle) { - int ret = DMERR_INIT_FAIL; + int ret = DMERR_OK; // Check if we want to preload raw data? if (handle->lib->flags & DRF_PRELOAD_RAW) @@ -624,6 +624,8 @@ if (ret == DMERR_OK) handle->flags |= DMF_LOADED_RAW | DMF_PERSIST; } + else + ret = DMERR_INIT_FAIL; dmfreset(handle); } diff -r 2f02d9b4caa3 -r b505b81a43de dmsimple.c --- a/dmsimple.c Sun Apr 21 19:58:59 2013 +0300 +++ b/dmsimple.c Sun Apr 21 20:03:08 2013 +0300 @@ -253,7 +253,7 @@ char buf[128]; if ((res = dmf_open(engine.resources, filename, &file)) != DMERR_OK) - return DMERR_FOPEN; + return res; while (dmfgets(buf, sizeof(buf), file) != NULL) {