Changeset 1315 for trunk/dll/mainwnd.c

Timestamp:

Dec 3, 2008, 7:28:47 PM (17 years ago)

Author:

Gregg Young

Message:

Improve multithread treecnr scan to prevent scan of "last" directory container prior to tree scan completion; prevents duplicate directory names in tree.

File:

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

trunk/dll/mainwnd.c

@@ -70 +70 @@
   01 Sep 08 GKY Save toolbars immediately on change. Add bmps for default toolbars
   29 Nov 08 GKY Remove or replace with a mutex semaphore DosEnterCriSec where appropriate.
+  03 Dec 08 GKY Use StubbyScanCount to prevent scan of "last" directory container prior to
+                tree scan completion; prevents duplicate directory names in tree.
 
 ***********************************************************************/
@@ -149 +151 @@
 #include "wrappers.h"                   // xfree
 #include "fortify.h"
+#include "filldir.h"                    // StubbyScanCount
 
 static BOOL CloseDirCnrChildren(HWND hwndClient);
@@ -5927 +5930 @@
         if (*argv[x] == '/' || *argv[x] == ';')
           continue;
-        if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE))
+        if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE)) {
+          DosSleep(10); // Give time for StubbyScanThreads to start
+          while (StubbyScanCount !=0)
+            DosSleep(50);
           OpenDirCnr((HWND) 0, hwndMain, hwndTree, TRUE, argv[x]);
+        }
       }
     }