Changeset 1873 for trunk/dll/dircnrs.c

Timestamp:

Sep 26, 2015, 7:23:13 PM (10 years ago)

Author:

Gregg Young

Message:

Adjustments to ShowTreeRec to eliminate failures and reduce retries and container noise on tree switches. Remove fInitialDriveScan code. Changes to speed up ExpandAll. WaitFleshWorkListEmpty now gives error message and returns if semaphore request fails more than 5 consecutive times.

File:

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

trunk/dll/dircnrs.c

@@ -2864 +2864 @@
                   // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                   if (SHORT2FROMMP(mp1) == CN_EXPANDTREE && AddFleshWorkRequest(hwnd, pci, eFlesh) &&
-                      !dcd->suspendview && fTopDir ) {
+                      !dcd->suspendview && fTopDir  && !fSwitchTreeOnDirChg) {
                     PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);
                     //DbgMsg(pszSrcFile, __LINE__, "UM_TOPDIR %p pci %p", hwnd, pci);
@@ -2873 +2873 @@
             }
             else if (SHORT2FROMMP(mp1) == CN_EXPANDTREE) {
-              if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview && fTopDir) {
+              if (AddFleshWorkRequest(hwnd, pci, eFlesh) && !dcd->suspendview &&
+                  fTopDir && !fSwitchTreeOnDirChg) {
                 // 2015-08-07 SHL FIXME to wait for Flesh to finish before PostMsg
                 PostMsg(hwnd, UM_TOPDIR, MPFROMP(pci), MPVOID);