X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fjoin.c;h=0f47f0b74cb6e91c237b9e6fe5b9bc6f587eade0;hp=7d33eb895e54b7ee0945cf569f19ed7d6fd41ec0;hb=fe6c34ebb7d5adeeceeed22142e080965d85a1eb;hpb=ad4f8818b728ef7cd1c5304bcd50a545df7acc8a diff --git a/src/join.c b/src/join.c index 7d33eb89..0f47f0b7 100644 --- a/src/join.c +++ b/src/join.c @@ -133,7 +133,7 @@ join_wims(WIMStruct **swms, unsigned num_swms, swms[i]->fp = NULL; } - if (ret != 0) + if (ret) return ret; if (progress_func) { @@ -143,15 +143,14 @@ join_wims(WIMStruct **swms, unsigned num_swms, } } - /* Write metadata resources from the first SWM part */ - swms[0]->out_fp = joined_wim->out_fp; - ret = for_image(swms[0], WIMLIB_ALL_IMAGES, write_metadata_resource); - swms[0]->out_fp = NULL; - fclose(swms[0]->fp); - swms[0]->fp = NULL; - - if (ret) - return ret; + /* Copy the metadata resources from the first SWM part */ + joined_wim->hdr.image_count = swms[0]->hdr.image_count; + for (i = 0; i < joined_wim->hdr.image_count; i++) { + ret = copy_resource(swms[0]->image_metadata[i].metadata_lte, + joined_wim); + if (ret) + return ret; + } /* Write lookup table, XML data, and optional integrity table */ joined_wim->hdr.image_count = swms[0]->hdr.image_count;