Changeset 1643 for trunk

Timestamp:

Oct 23, 2011, 12:13:04 AM (14 years ago)

Author:

Gregg Young

Message:

Removed UnFlesh call from StubbyScanThread; This seems to significantly cut load times.

File:

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

trunk/dll/filldir.c

@@ -98 +98 @@
                 responsiveness when closing containers with large numbers of items
   12 Jun 11 GKY Replaced SleepIfNeeded with IdleIfNeeded in the container loade loop
+  22 Oct 11 GKY Removing unneeded UnFlesh call from StubbyScanThread appears to significantly speed opening of FM/2
 
 ***********************************************************************/
@@ -255 +256 @@
             if (!(flags & ((fRScanNoWrite ? 0 : DRIVE_NOTWRITEABLE) ||
                            (fRScanSlow ? 0 : DRIVE_SLOW)))) {
-              UnFlesh(StubbyScan->hwndCnr, StubbyScan->pci);
               Flesh(StubbyScan->hwndCnr, StubbyScan->pci);
             }
@@ -261 +261 @@
           else {
             Stubby(StubbyScan->hwndCnr, StubbyScan->pci);
-            //if (!ok)
-             // FixedVolume--;
           }
         }
@@ -1694 +1692 @@
           ULONG flags = driveflags[iDrvNum];    // Speed up
           if (~flags & DRIVE_INVALID &&
-              ~flags & DRIVE_NOPRESCAN &&
-              (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE))
-          {
-            if (xbeginthread(StubbyScanThread,
+              ~flags & DRIVE_NOPRESCAN && (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) {
+            // DbgMsg(pszSrcFile, __LINE__, "Begin Thread %s", pci->pszFileName);
+            if (xbeginthread(StubbyScanThread,
                              65536,
                              stubbyScan,
-                             pszSrcFile,
-                             __LINE__) == -1)
-            {
-              xfree(stubbyScan, pszSrcFile, __LINE__);
-            }
+                             pszSrcFile, __LINE__) == -1)
+              xfree(stubbyScan, pszSrcFile, __LINE__);
+
           } // if drive needs to be scanned
         }