Changeset 1314 for trunk/dll/arccnrs.c

Timestamp:

Dec 3, 2008, 7:26:07 PM (17 years ago)

Author:

Gregg Young

Message:

Subdirectory from the arcname for the extract path only created if an extract menu option is selected. (Ticket 22)

File:

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

trunk/dll/arccnrs.c

@@ -67 +67 @@
                 for the extract path to arc container.
   02 Dec 08 JBS Ticket 284: Changed string indicating no Start/End of list strings.
+  03 Dec 08 GKY Subdirectory from the arcname for the extract path only created if an "extract"
+                menu option is selected.
 
 ***********************************************************************/
@@ -1819 +1821 @@
               UINT numfiles = 0, numalloc = 0;
 
+              if (li->targetpath && fFileNameCnrPath &&
+                  stricmp(lastextractpath, li->targetpath)) {
+                strcpy(lastextractpath, li->targetpath);
+                SetDir(dcd->hwndParent, hwnd, li->targetpath, 1);
+              }
               for (x = 0; li->list[x]; x++) {
                 BldFullPathName(fullname, li->targetpath, li->list[x]);
@@ -3010 +3017 @@
       case IDM_ARCEXTRACTEXIT:
       case IDM_ARCEXTRACT:
+        if (dcd->directory && fFileNameCnrPath &&
+            stricmp(lastextractpath, dcd->directory)) {
+          strcpy(lastextractpath, dcd->directory);
+          SetDir(dcd->hwndParent, hwnd, dcd->directory, 1);
+        }
         if (dcd->info->extract)
           runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
@@ -3022 +3034 @@
       case IDM_ARCEXTRACTWDIRSEXIT:
       case IDM_ARCEXTRACTWDIRS:
+        if (dcd->directory && fFileNameCnrPath &&
+            stricmp(lastextractpath, dcd->directory)) {
+          strcpy(lastextractpath, dcd->directory);
+          SetDir(dcd->hwndParent, hwnd, dcd->directory, 1);
+        }
         if (dcd->info->exwdirs)
           runemf2(SEPARATE | WINDOWED | ASYNCHRONOUS |
@@ -3875 +3892 @@
           }
         }
-        if (IsFile(dcd->directory) == -1)
-          SetDir(dcd->hwndFrame, dcd->hwndCnr, dcd->directory, 1);
       }
 #     ifdef FORTIFY