Changeset 1793 for trunk/dll/dircnrs.c

Timestamp:

Sep 7, 2014, 7:28:33 PM (11 years ago)

Author:

Gregg Young

Message:

Corrected fix for filter trap on close during initial scan. I had failed to account for the fact that directory containers get closed other than at shutdown.

File:

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

trunk/dll/dircnrs.c

@@ -1213 +1213 @@
                         0,
                         SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
-      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       FreeList(dcd->lastselection);
       WinSetWindowPtr(dcd->hwndCnr, QWL_USER, NULL);    // 13 Apr 10 SHL Set NULL before freeing dcd
+      DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
       xfree(dcd, pszSrcFile, __LINE__);
+      DosReleaseMutexSem(hmtxFiltering);
       DosPostEventSem(CompactSem);
     }
@@ -3526 +3527 @@
                         0,
                         SWP_RESTORE | SWP_SHOW | SWP_ACTIVATE | SWP_ZORDER);
+      FreeList(dcd->lastselection);
       DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
-      FreeList(dcd->lastselection);
       free(dcd);
+      DosReleaseMutexSem(hmtxFiltering);
       WinSetWindowPtr(hwnd, QWL_USER, NULL);
       DosPostEventSem(CompactSem);