Changeset 1651

Timestamp:

Nov 19, 2011, 11:15:55 PM (14 years ago)

Author:

Gregg Young

Message:

Reverted part of the changes as they caused dbl entries

File:

• trunk/dll/flesh.c (modified) (1 diff)

trunk/dll/flesh.c

@@ -192 +192 @@
                                MPFROMP(pciParent),
                                MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
-  if (pciL && (INT) pciL != -1 && *pciL->pszFileName)
-    return FALSE; 
-  dcd = INSTDATA(hwndCnr);
-  if (dcd && dcd->size != sizeof(DIRCNRDATA))
-    dcd = NULL;
-  if (driveflags[toupper(*pciParent->pszFileName) - 'A'] &
-      DRIVE_INCLUDEFILES)
-    includefiles = TRUE;
-    ProcessDirectory(hwndCnr,
-                     pciParent,
-                     pciParent->pszFileName,
-                     includefiles,      // filestoo
-                     TRUE,              // recurse
-                     TRUE,              // partial
-                     NULL,              // stop flag
-                     dcd,
-                     NULL,              // total files
-                     NULL);             // total bytes
-  driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
+  if (!pciL || !*pciL->pszFileName) {
+    if (pciL && (INT) pciL != -1)
+      RemoveCnrItems(hwndCnr, pciL, 1, CMA_FREE);
+    dcd = INSTDATA(hwndCnr);
+    if (dcd && dcd->size != sizeof(DIRCNRDATA))
+      dcd = NULL;
+    if (driveflags[toupper(*pciParent->pszFileName) - 'A'] &
+        DRIVE_INCLUDEFILES)
+      includefiles = TRUE;
+      ProcessDirectory(hwndCnr,
+                       pciParent,
+                       pciParent->pszFileName,
+                       includefiles,    // filestoo
+                       TRUE,            // recurse
+                       TRUE,            // partial
+                       NULL,            // stop flag
+                       dcd,
+                       NULL,            // total files
+                       NULL);           // total bytes
+    //}
+  }
+    driveflags[*pciParent->pszFileName - 'A'] |= DRIVE_RSCANNED;
   return TRUE;
 }