Changeset 1901

Timestamp:

May 29, 2024, 10:05:35 PM (15 months ago)

Author:

Gregg Young

Message:

Fix ticket #583 tree corruption on startup or rescan and ticket #584 spurious "no drop" on first subdirectory in tree.

File:

• trunk/dll/flesh.c (modified) (2 diffs)

trunk/dll/flesh.c

@@ -282 +282 @@
                      NULL,              // total files
                      NULL,              // total bytes
-                     (pciL && (INT)pciL != -1) ? pciL->pszDisplayName : 0);
+                     (pciL && (INT)pciL != -1) && pciL->pszDisplayName ? pciL->pszDisplayName : 0);
     pciParent->fleshed = TRUE;
     return TRUE;
@@ -600 +600 @@
                      hptrReadonly : hptrFile;
             }
-            pci->rc.hptrIcon = hptr;
+            pci->rc.hptrIcon = hptr;
+            pci->attrFile = pffb->attrFile;
             memset(&ri, 0, sizeof(RECORDINSERT));
             ri.cb = sizeof(RECORDINSERT);