Changeset 1551 for trunk/dll/filldir.c

Timestamp:

Nov 15, 2010, 4:33:25 AM (15 years ago)

Author:

Gregg Young

Message:

This code adds the semaphores to prevent a rescan from starting before the current one is finished; it fixes the double directory listing in the tree container and streamlines scanning. It update mapsym.pl to the latest version. Some code cleanup is included

File:

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

trunk/dll/filldir.c

@@ -261 +261 @@
   DbgMsg(pszSrcFile, __LINE__, "ProcessDirCount %i FixedVolume %i",
          ProcessDirCount, FixedVolume);
-  if (fInitialDriveScan && ProcessDirCount >= FixedVolume) {
-    fInitialDriveScan = FALSE;
-    DosPostEventSem(hevInitialCnrScanComplete);
-    DosCloseEventSem(hevInitialCnrScanComplete);
-    if (fSwitchTree && hwndTree && fSaveState && pszFocusDir) {
+  if (ProcessDirCount >= FixedVolume) {
+    DosPostEventSem(hevTreeCnrScanComplete);
+    if (fInitialDriveScan && fSwitchTree && hwndTree && fSaveState && pszFocusDir) {
        // Keep drive tree in sync with directory container
       if (hwndMain) {
@@ -277 +275 @@
       }
     }
+    fInitialDriveScan = FALSE;
   }
 # ifdef FORTIFY
@@ -1709 +1708 @@
   fDummy = FALSE;
   DosPostEventSem(CompactSem);
-  DosReleaseMutexSem(hmtFillingTreeCnr);
 
   if (!fDontSuggestAgain) {