Fix the issue where .png is added when saving even if the file format…

… does not use a converter such as jpg or png file.
WinMerge · Sep 26, 2023 · 276b466 · 276b466
1 parent e56ae07
commit 276b466
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/WinIMergeLib/ImgDiffBuffer.hpp b/src/WinIMergeLib/ImgDiffBuffer.hpp
@@ -1511,15 +1511,17 @@ class CImgDiffBuffer
 			else
 			{
 				m_imgOrigMultiPage[i].close();
-				if (ImgConverter::isSupportedImage(m_filename[i].c_str()))
+				if (!m_imgOrig[i].load(m_filename[i]))
 				{
-					if (m_imgConverter[i].load(m_filename[i].c_str()))
-						m_imgConverter[i].render(m_imgOrig[i], 0, m_vectorImageZoomRatio);
-				}
-				if (!m_imgConverter[i].isValid())
-				{
-					if (!m_imgOrig[i].load(m_filename[i]))
+					if (ImgConverter::isSupportedImage(m_filename[i].c_str()))
+					{
+						if (m_imgConverter[i].load(m_filename[i].c_str()))
+							m_imgConverter[i].render(m_imgOrig[i], 0, m_vectorImageZoomRatio);
+					}
+					if (!m_imgConverter[i].isValid())
+					{
 						bSucceeded = false;
+					}
 				}
 				m_imgOrig32[i] = m_imgOrig[i];
 				std::map<std::string, std::string> meta = m_imgOrig[i].getMetadata();