X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=71e43c099236e6ba7311cdc58a34e1e87416db88;hb=5f8590a7dcdf45a7f56f50ad96ac6349ffbafc08;hp=8a0abe5d663e912c0a28d6058c820cd368eebedc;hpb=f303b46312f8d8be4210fba66082d5a7572dbd70;p=wimlib

diff --git a/src/join.c b/src/join.c
index 8a0abe5d..71e43c09 100644
--- a/src/join.c
+++ b/src/join.c
@@ -112,7 +112,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 				      "chunk size");
 				return WIMLIB_ERR_SPLIT_INVALID;
 			}
-			if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
+			if (memcmp(guid, swm->hdr.guid, WIM_GUID_LEN) != 0) {
 				ERROR("The split WIMs do not all have the same "
 				      "GUID");
 				return WIMLIB_ERR_SPLIT_INVALID;
@@ -203,13 +203,13 @@ wimlib_join(const tchar * const *swm_names,
 	if (ret)
 		goto out_free_swms;
 
-	swm0->guid_set_explicitly = 1;
-
 	/* It is reasonably safe to provide, WIMLIB_WRITE_FLAG_STREAMS_OK, as we
 	 * have verified that the specified split WIM parts form a spanned set.
 	 */
 	ret = wimlib_write(swm0, output_path, WIMLIB_ALL_IMAGES,
-			   wim_write_flags | WIMLIB_WRITE_FLAG_STREAMS_OK,
+			   wim_write_flags |
+				WIMLIB_WRITE_FLAG_STREAMS_OK |
+				WIMLIB_WRITE_FLAG_RETAIN_GUID,
 			   1, progress_func);
 out_free_swms:
 	for (i = 0; i < num_additional_swms + 1; i++)