Mercurial > hg > dmlib

changeset 627:bf8986a6ede1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 15 Apr 2013 03:32:59 +0300
parents 1dc029925377
children 0533f94e843b
files dmres.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/dmres.c	Mon Apr 15 03:26:45 2013 +0300
+++ b/dmres.c	Mon Apr 15 03:32:59 2013 +0300
@@ -622,21 +622,17 @@
             {
                 handle->flags |= DMF_LOADED_RAW;
             }
+            dmf_reset(handle);
         }
     }
     else
     {
-        if (((handle->flags & DMF_PRELOAD_RES) || (handle->lib->flags & DRF_PRELOAD_RES)) &&
-            handle->fops->preload != NULL)
-            ret = handle->fops->preload(handle);
-        else
         if (handle->fops->fopen != NULL)
             ret = handle->fops->fopen(handle);
         else
             return DMERR_FOPEN;
     }
 
-    dmf_reset(handle);
 
     // Check if resource data is to be preloaded
     if ((handle->flags & DMF_PRELOAD_RES) || (handle->lib->flags & DRF_PRELOAD_RES))
@@ -657,10 +653,11 @@
                 if ((handle->flags & DMF_PERSIST) == 0)
                     dmres_purge_raw_data(handle);
             }
+
+            dmf_reset(handle);
         }
     }
 
-    dmf_reset(handle);
     return ret;
 }