Fix regression in SUM mode when no output result file specified

idrassi · idrassi · commit 8f9ba6e18fb9 · 2021-07-26T23:47:26.000+02:00
diff --git a/DirHash.cpp b/DirHash.cpp
@@ -1726,7 +1726,9 @@ DWORD HashDirectory(const CPath& dirPath, Hash* pHash, bool bIncludeNames, bool
 				}
 				else
 				{
-					if (g_outputFileName.GetAbsolutPathValue().empty() || (0 == _wcsicmp(g_outputFileName.GetAbsolutPathValue().c_str(), entry.GetPath().GetAbsolutPathValue().c_str())))
+					if (g_outputFileName.GetAbsolutPathValue().empty())
+						g_sumFileSkipped = true;
+					else if  (0 == _wcsicmp(g_outputFileName.GetAbsolutPathValue().c_str(), entry.GetPath().GetAbsolutPathValue().c_str()))
 					{
 						g_sumFileSkipped = true;
 						continue;

Original file line number	Diff line number	Diff line change
`@@ -1726,7 +1726,9 @@ DWORD HashDirectory(const CPath& dirPath, Hash* pHash, bool bIncludeNames, bool`
`1726`	`1726`	`}`
`1727`	`1727`	`else`
`1728`	`1728`	`{`
`1729`		`- if (g_outputFileName.GetAbsolutPathValue().empty() \|\| (0 == _wcsicmp(g_outputFileName.GetAbsolutPathValue().c_str(), entry.GetPath().GetAbsolutPathValue().c_str())))`
	`1729`	`+ if (g_outputFileName.GetAbsolutPathValue().empty())`
	`1730`	`+ g_sumFileSkipped = true;`
	`1731`	`+ else if (0 == _wcsicmp(g_outputFileName.GetAbsolutPathValue().c_str(), entry.GetPath().GetAbsolutPathValue().c_str()))`
`1730`	`1732`	`{`
`1731`	`1733`	`g_sumFileSkipped = true;`
`1732`	`1734`	`continue;`