Changeset 1550 for trunk/dll/treecnr.c

Timestamp:

Nov 3, 2010, 3:50:42 AM (15 years ago)

Author:

Gregg Young

Message:

This actually fixes the double names in the tree container. It also streamlines the initial scan code by eliminating multiple redundant scans.

File:

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

trunk/dll/treecnr.c

@@ -359 +359 @@
     if (pciToSelect && (INT) pciToSelect != -1) {
       //DbgMsg(pszSrcFile, __LINE__, "TOP %i %i", fTopDir, maketop);
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (fTopDir || maketop) {
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
       }
-      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
-        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (!quickbail) {
         WinSendMsg(hwndCnr,
@@ -654 +654 @@
           fTopDir = TRUE;
         }
-        if (fInitialDriveScan)
-          DosWaitEventSem(hevInitialCnrScanComplete, SEM_INDEFINITE_WAIT);
         ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
+        // fixme Is this PostMsg needed if recursive scan has already been done?
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
         dcd->suspendview = (USHORT) tempsusp;