imagex_capture_or_append(): Correctly use template_wim

diff --git a/NEWS b/NEWS
index c598fe98a8ba7c0f5923f94ec3a6d4f5b6dcc9e2..2847115b9765e8f589fac9f604c7b886b5031a4c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ Version 1.5.1:
        wimlib can now open WinPE WIMs from WAIK v2.1, which had a quirk that
        needed to be handled.
 
        wimlib can now open WinPE WIMs from WAIK v2.1, which had a quirk that
        needed to be handled.
 

+       A bug related to the interpretation of the IMAGE in the
+       --update-of=[WIMFILE:]IMAGE argument to `wimlib-imagex capture' and
+       `wimlib-imagex append' has been fixed.
+

 Version 1.5.0:
        Added support for "pipable" WIMs.  Pipable WIMs allow capturing images
        to standard output and applying images from standard input, but they are
 Version 1.5.0:
        Added support for "pipable" WIMs.  Pipable WIMs allow capturing images
        to standard output and applying images from standard input, but they are

diff --git a/programs/imagex.c b/programs/imagex.c
index b74502b5fc0948e6b1e1ee5be4f14bb0e10ee454..d84feb3e77aa6bb686b6a77ec944f9d89e2c90d5 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1982,7 +1982,7 @@ imagex_capture_or_append(int argc, tchar **argv, int cmd)
                        unsigned long n;
                        struct wimlib_wim_info info;
 
                        unsigned long n;
                        struct wimlib_wim_info info;
 

-                       wimlib_get_wim_info(wim, &info);
+                       wimlib_get_wim_info(template_wim, &info);

                        n = tstrtoul(template_image_name_or_num + 1, &tmp, 10);
                        if (n >= 1 && n <= info.image_count &&
                            *tmp == T('\0') &&
                        n = tstrtoul(template_image_name_or_num + 1, &tmp, 10);
                        if (n >= 1 && n <= info.image_count &&
                            *tmp == T('\0') &&