Changeset 1326 for trunk/dll/update.c

Timestamp:

Dec 9, 2008, 3:18:36 AM (17 years ago)

Author:

Gregg Young

Message:

Changes to avoid duplicate directory names on scan using StubbyScanThread.

File:

• trunk/dll/update.c (modified) (4 diffs)

trunk/dll/update.c

@@ -189 +189 @@
             dcd->ullTotalBytes += ullTotalBytes;
             PostMsg(hwndCnr, UM_RESCAN, MPVOID, MPVOID);
-            if (pci->attrFile & FILE_DIRECTORY)
-              Stubby(hwndCnr, pci);
+            if (pci->attrFile & FILE_DIRECTORY) {
+              if (fInitialDriveScan)
+                Stubby(hwndCnr, pci);
+              else {
+                while (StubbyScanCount != 0)
+                  DosSleep(50);
+                Stubby(hwndCnr, pci);
+              }
+            }
           }
         }
@@ -282 +289 @@
             if (dcd->type == DIR_FRAME) {
               dcd->ullTotalBytes += ullTotalBytes;
-            }
-            Stubby(hwndCnr, pci);
+            }
+            if (fInitialDriveScan)
+              Stubby(hwndCnr, pci);
+            else {
+              while (StubbyScanCount != 0)
+                DosSleep(50);
+              Stubby(hwndCnr, pci);
+            }
           }
         }
@@ -450 +463 @@
                 }
                 repos = TRUE;
-                if (pci->attrFile & FILE_DIRECTORY)
-                  Stubby(hwndCnr, pci);
+                if (pci->attrFile & FILE_DIRECTORY) {
+                  if (fInitialDriveScan)
+                    Stubby(hwndCnr, pci);
+                  else {
+                    while (StubbyScanCount != 0)
+                      DosSleep(50);
+                    Stubby(hwndCnr, pci);
+                  }
+                }
               }
               else
@@ -548 +568 @@
                       dcd->ullTotalBytes += ullTotalBytes;
                   }
-                  repos = TRUE;
-                  Stubby(hwndCnr, pci);
+                  repos = TRUE;
+                  if (fInitialDriveScan)
+                    Stubby(hwndCnr, pci);
+                  else {
+                    while (StubbyScanCount != 0)
+                      DosSleep(50);
+                    Stubby(hwndCnr, pci);
+                  }
                 }
                 else