Changeset 1741 for trunk/dll/collect.c

Timestamp:

Feb 23, 2014, 12:32:04 AM (12 years ago)

Author:

Gregg Young

Message:

Fix warn readonly yes don't ask to work when recursing directories.

File:

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

trunk/dll/collect.c

@@ -83 +83 @@
   05 Sep 12 SHL Correct UM_COLLECTFROMFILE bad list file reporting
   13 Dec 13 SHL CollectorCnrWndProc IDM_FILTER: avoid exception on missing fileName
+  22 Feb 14 GKY Fix warn readonly yes don't ask to work when recursing directories.
 
 ***********************************************************************/
@@ -158 +159 @@
 #include "excputil.h"                   // xbeginthread
 #include "walkem.h"                     // WalkAllDlgProc
+#include "copyf.h"                      // ignorereadonly
 
 // Data definitions
@@ -640 +642 @@
       case IDM_MCIPLAY:
       case IDM_UPDATE:
+        if (li->type == IDM_DELETE)
+          ignorereadonly = FALSE;
         if (PostMsg(hwnd, UM_MASSACTION, mp1, mp2))
           return (MRESULT) TRUE;
@@ -2393 +2397 @@
                 action = UM_MASSACTION;
                 break;
-              }
+              }
+              if (li->type == IDM_DELETE)
+                ignorereadonly = FALSE;
               if (li->type == IDM_SHADOW || li->type == IDM_OBJECT ||
                   li->type == IDM_SHADOW2)