MAGNIMEX-145: change behavior for image existing in other product

Author: A-Komar

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1472,21 +1472,18 @@ protected function _saveProducts()
                                 ];
                             }
                         }
-                    } else {
-                        foreach ($this->_imagesArrayKeys as $imageCol) {
-                            if (!empty($rowData[$imageCol]) && ($rowData[$imageCol] == $imagePath)) {
-                                $rowData[$imageCol] = '';
-                            }
-                        }
                     }
-                    if (!isset($existingImages[$imagePath]) || in_array($rowSku, $existingImages[$imagePath])) {
-                        foreach ($this->_imagesArrayKeys as $imageCol) {
-                            if (!empty($rowData[$imageCol])
-                                && ($imageCol != self::COL_MEDIA_IMAGE)
-                                && isset($uploadedGalleryFiles[$rowData[$imageCol]])
-                            ) {
-                                $rowData[$imageCol] = $uploadedGalleryFiles[$rowData[$imageCol]];
-                            }
+                    foreach ($this->_imagesArrayKeys as $imageCol) {
+                        if (empty($rowData[$imageCol]) || ($imageCol == self::COL_MEDIA_IMAGE)) {
+                            continue;
+                        }
+                        if (isset($existingImages[$imagePath])
+                            && !in_array($rowSku, $existingImages[$imagePath])
+                            && (($rowData[$imageCol] == $imagePath) || ($rowData[$imageCol] == $mediaImage))
+                        ) {
+                            unset($rowData[$imageCol]);
+                        } elseif (isset($uploadedGalleryFiles[$rowData[$imageCol]])) {
+                            $rowData[$imageCol] = $uploadedGalleryFiles[$rowData[$imageCol]];
                         }
                     }
                 }