]> glassweightruler.freedombox.rocks Git - Ventoy.git/commitdiff
Don't delete partition when update in GPT partition style.
authorlongpanda <admin@ventoy.net>
Fri, 24 Jul 2020 15:23:40 +0000 (23:23 +0800)
committerlongpanda <admin@ventoy.net>
Fri, 24 Jul 2020 15:24:05 +0000 (23:24 +0800)
INSTALL/Ventoy2Disk.exe
Ventoy2Disk/Ventoy2Disk/PhyDrive.c

index 5a6fb2905187d4fea1e87ca5ca78af64a3fa41fb..20dee82a94e323b76d6d56122ba30d01d59f056b 100644 (file)
Binary files a/INSTALL/Ventoy2Disk.exe and b/INSTALL/Ventoy2Disk.exe differ
index 2db6e0e7e00ed58424bed5250dad7218fb95a00c..ec266eecd8caf17b1b16443c670e8d0a4fc30499 100644 (file)
@@ -1852,24 +1852,26 @@ int UpdateVentoy2PhyDrive(PHY_DRIVE_INFO *pPhyDrive)
 \r
     if (!TryWritePart2(hDrive, StartSector))\r
     {\r
 \r
     if (!TryWritePart2(hDrive, StartSector))\r
     {\r
-        ForceMBR = TRUE;\r
-        Log("Try write failed, now delete partition 2...");\r
+               if (pPhyDrive->PartStyle == 0)\r
+               {\r
+                       ForceMBR = TRUE;\r
+                       Log("Try write failed, now delete partition 2...");\r
 \r
 \r
-        CHECK_CLOSE_HANDLE(hDrive);\r
+                       CHECK_CLOSE_HANDLE(hDrive);\r
 \r
 \r
-        Log("Now delete partition 2...");\r
-        DeletePartitions(pPhyDrive->PhyDrive, TRUE);\r
+                       Log("Now delete partition 2...");\r
+                       DeletePartitions(pPhyDrive->PhyDrive, TRUE);\r
 \r
 \r
-        hDrive = GetPhysicalHandle(pPhyDrive->PhyDrive, TRUE, TRUE, FALSE);\r
-        if (hDrive == INVALID_HANDLE_VALUE)\r
-        {\r
-            Log("Failed to GetPhysicalHandle for write.");\r
-            rc = 1;\r
-            goto End;\r
-        }\r
+                       hDrive = GetPhysicalHandle(pPhyDrive->PhyDrive, TRUE, TRUE, FALSE);\r
+                       if (hDrive == INVALID_HANDLE_VALUE)\r
+                       {\r
+                               Log("Failed to GetPhysicalHandle for write.");\r
+                               rc = 1;\r
+                               goto End;\r
+                       }\r
+               }\r
     }\r
 \r
     }\r
 \r
-\r
     PROGRESS_BAR_SET_POS(PT_FORMAT_PART2);\r
 \r
     Log("Write Ventoy to disk ............................ ");\r
     PROGRESS_BAR_SET_POS(PT_FORMAT_PART2);\r
 \r
     Log("Write Ventoy to disk ............................ ");\r