Merge pull request #245 from EpicGazel/main

Fixed issue #234
Lymphatus · Jan 7, 2024 · 5e3b646 · 5e3b646
2 parents 447a9de + 0f62c14
commit 5e3b646
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/models/CImage.cpp b/src/models/CImage.cpp
@@ -242,18 +242,24 @@ bool CImage::compress(const CompressionOptions& compressionOptions)
             }
         }
 
+        bool copyResult = false;
         if (!outputIsBiggerThanInput) {
             inputCopyFile = tempFileFullPath;
+            copyResult = QFile::copy(inputCopyFile, outputFullPath);
         } else {
             this->status = CImageStatus::WARNING;
             this->additionalInfo = QIODevice::tr("Skipped: compressed file is bigger than original");
+            // Overwrite output file name with original file name to avoid broken extension (ex: .png named .webp) 
+            fullFileName = inputFileInfo.fileName();
+            outputFullPath = outputDir.absoluteFilePath(fullFileName);    
+            copyResult = QFile::copy(inputCopyFile, outputFullPath);
             if (outputAlreadyExists) {
                 QFileInfo outputFileInfo = QFileInfo(outputFullPath);
                 this->setCompressedInfo(outputFileInfo);
                 return true;
             }
         }
-        bool copyResult = QFile::copy(inputCopyFile, outputFullPath);
+
         if (!copyResult) {
             qCritical() << "Failed to copy from" << inputCopyFile << "to" << outputFullPath;
             this->additionalInfo = QIODevice::tr("Cannot copy output file, check your permissions");