Changeset 1778 for trunk/dll/filldir.c

Timestamp:

Jun 27, 2014, 12:30:54 AM (11 years ago)

Author:

Steven Levine

Message:

Rework dircnrs.c DirObjWndProc UM_RESCAN to avoid hanging FM/2 Lite when
drive tree hidden. Also speeds up startup if Switch Tree on directory change
not enabled.

File:

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

trunk/dll/filldir.c

@@ -236 +236 @@
   HAB thab;
   HMQ hmq = (HMQ) 0;
-  //BOOL ok;
   static INT ProcessDirCount = 0;
 
@@ -283 +282 @@
     DosReleaseMutexSem(hmtxScanning);
     DosPostEventSem(hevTreeCnrScanComplete);
-    if (fInitialDriveScan && fSwitchTree && hwndTree && fSaveState && pszFocusDir) {
+    if (fInitialDriveScan && fSwitchTreeOnDirChg && hwndTree && fSaveState && pszFocusDir) {
        // Keep drive tree in sync with directory container
       if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszFocusDir), MPVOID))
@@ -290 +289 @@
     ProcessDirCount = 0;
     FixedVolume = 0;
-    //fInitialDriveScan = FALSE;
   }
 # ifdef FORTIFY
@@ -1534 +1532 @@
 
   // move cursor onto the default drive rather than the first drive
-  if (!fSwitchTree) {
+  if (!fSwitchTreeOnDirChg) {
     pci = (PCNRITEM) WinSendMsg(hwndCnr,
                                 CM_QUERYRECORD,
@@ -1707 +1705 @@
                                 MPFROMP(pci),
                                 MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-  }
+  } // while pci
 
   if (hwndMain)