ACP2E-1479: Product with any custom option causes an error when deleting product images

Author: Chhandak.Barua

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -223,16 +223,23 @@ private function handleImageRemoveError($postData, $productId)
     {
         if (isset($postData['product']['media_gallery']['images'])) {
             $removedImagesAmount = 0;
+            $removedImages = [];
             foreach ($postData['product']['media_gallery']['images'] as $image) {
                 if (!empty($image['removed'])) {
                     $removedImagesAmount++;
+                    $removedImages[] = $image['value_id'];
                 }
             }
             if ($removedImagesAmount) {
                 $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
                 $product = $this->productRepository->getById($productId);
                 $images = $product->getMediaGallery('images');
-                if (is_array($images) && $expectedImagesAmount >= count($images)) {
+                foreach ($images as $key => $imageItem) {
+                    if (in_array($imageItem['value_id'], $removedImages)) {
+                        unset($images[$key]);
+                    }
+                }
+                if (is_array($images) && $expectedImagesAmount != count($images)) {
                     $this->messageManager->addNoticeMessage(
                         __('The image cannot be removed as it has been assigned to the other image role')
                     );