Changeset 1702

Timestamp:

Dec 17, 2013, 11:45:11 PM (12 years ago)

Author:

Steven Levine

Message:

CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName

File:

• trunk/dll/collect.c (modified) (5 diffs)

trunk/dll/collect.c

@@ -80 +80 @@
   13 Aug 11 GKY Have file count and KIBs update at the same time
   04 Aug 12 GKY Changes to use Unlock to unlock files if Unlock.exe is in path both from menu and as part of copy, move and
-                delete operations
+                delete operations
   05 Sep 12 SHL Correct UM_COLLECTFROMFILE bad list file reporting
+  13 Dec 13 SHL CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName
 
 ***********************************************************************/
@@ -809 +810 @@
               // 2011-05-29 SHL fixme to complain on failure
               PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
-              ulRecsInserted += ulRecsToInsert;
-              dcd->ullTotalBytes = ullTotalBytes;
+              ulRecsInserted += ulRecsToInsert;
+              dcd->ullTotalBytes = ullTotalBytes;
               pciFirst = NULL;
               ulRecsToInsert = 0;
@@ -952 +953 @@
               first = FALSE;
           }
-        }  // while not eof
+        } // while not eof
         fclose(fp);
       } // if file opened
@@ -1707 +1708 @@
       switch (SHORT1FROMMP(mp1)) {
       case IDM_SETTARGET:
-        SetTargetDir(hwnd, FALSE, NULL);
+        SetTargetDir(hwnd, FALSE, NULL);
         break;
 
@@ -2113 +2114 @@
           if (!*dcd->mask.szMask) {
             empty = TRUE;
+            // 2013-12-13 SHL Allow nul pszFileName
             pci = (PCNRITEM) CurrentRecord(hwnd);
-            if (pci && !(pci->attrFile & FILE_DIRECTORY)) {
+            if (pci && pci->pszFileName && ~pci->attrFile & FILE_DIRECTORY) {
               p = strrchr(pci->pszFileName, '\\');
               if (p) {