Changeset 1702


Ignore:
Timestamp:
Dec 17, 2013, 11:45:11 PM (12 years ago)
Author:
Steven Levine
Message:

CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/collect.c

    r1675 r1702  
    8080  13 Aug 11 GKY Have file count and KIBs update at the same time
    8181  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
    82                 delete operations
     82                delete operations
    8383  05 Sep 12 SHL Correct UM_COLLECTFROMFILE bad list file reporting
     84  13 Dec 13 SHL CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName
    8485
    8586***********************************************************************/
     
    809810              // 2011-05-29 SHL fixme to complain on failure
    810811              PostMsg(dcd->hwndCnr, UM_RESCAN, MPVOID, MPVOID);
    811               ulRecsInserted += ulRecsToInsert;
    812               dcd->ullTotalBytes = ullTotalBytes;
     812              ulRecsInserted += ulRecsToInsert;
     813              dcd->ullTotalBytes = ullTotalBytes;
    813814              pciFirst = NULL;
    814815              ulRecsToInsert = 0;
     
    952953              first = FALSE;
    953954          }
    954         }  // while not eof
     955        } // while not eof
    955956        fclose(fp);
    956957      } // if file opened
     
    17071708      switch (SHORT1FROMMP(mp1)) {
    17081709      case IDM_SETTARGET:
    1709         SetTargetDir(hwnd, FALSE, NULL);
     1710        SetTargetDir(hwnd, FALSE, NULL);
    17101711        break;
    17111712
     
    21132114          if (!*dcd->mask.szMask) {
    21142115            empty = TRUE;
     2116            // 2013-12-13 SHL Allow nul pszFileName
    21152117            pci = (PCNRITEM) CurrentRecord(hwnd);
    2116             if (pci && !(pci->attrFile & FILE_DIRECTORY)) {
     2118            if (pci && pci->pszFileName && ~pci->attrFile & FILE_DIRECTORY) {
    21172119              p = strrchr(pci->pszFileName, '\\');
    21182120              if (p) {
Note: See TracChangeset for help on using the changeset viewer.