Changeset 1506 for trunk/dll/treecnr.c

Timestamp:

Apr 12, 2010, 12:36:53 AM (15 years ago)

Author:

Gregg Young

Message:

Fixed hang and drive tree rescan failure resulting from event sem not being posted.

File:

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

trunk/dll/treecnr.c

@@ -80 +80 @@
                 before scan completes
   22 Nov 09 GKY Add LVM.EXE to partition submenu
-  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast
+                CHAR CONSTANT * as CHAR *.
+  11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
+                never being posted
 
 ***********************************************************************/
@@ -649 +652 @@
           temptop = fTopDir;
           fTopDir = TRUE;
-        }
-    DosWaitEventSem(hevInitialCnrScanComplete, SEM_INDEFINITE_WAIT);
+        }
+        if (fInitialDriveScan)
+          DosWaitEventSem(hevInitialCnrScanComplete, SEM_INDEFINITE_WAIT);
         ShowTreeRec(dcd->hwndCnr, (CHAR *)mp1, fCollapseFirst, TRUE);
         PostMsg(hwndTree, WM_COMMAND, MPFROM2SHORT(IDM_UPDATE, 0), MPVOID);
@@ -3272 +3276 @@
           WinSetWindowText(WinWindowFromID(hwndFrame, FID_TITLEBAR), "VTree");
           FixSwitchList(hwndFrame, "VTree");
+          fInitialDriveScan = FALSE;
           DosPostEventSem(hevInitialCnrScanComplete);
           DosCloseEventSem(hevInitialCnrScanComplete);
-          fInitialDriveScan = FALSE;
         }
         else {