Fix an issue where comparison results are not displayed correctly when "Refresh Selected" is performed by selecting an item that has a directory and file with the same name. (#1189)

- Change to judge that a directory or file exists only if the rescanned item type (directory or file) matches the original diffItem type in the diffItem update process.

Author: tjmprm77

Src/DirItem.cpp

@@ -98,3 +98,12 @@ void DirItem::ClearPartial()
 	size = DirItem::FILE_SIZE_NONE;
 	flags.reset();
 }
+
+/**
+ * @brief Return whether the item is a directory.
+ * @return true if the item is a directory.
+ */
+bool DirItem::IsDirectory() const
+{
+	return ((flags.attributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
+}

Src/DirItem.h

@@ -37,4 +37,5 @@ struct DirItem
 	String GetFile() const;
 	bool Update(const String &sFilePath);
 	void ClearPartial();
+	bool IsDirectory() const;
 };

Src/DirScan.cpp

@@ -783,8 +783,15 @@ static void UpdateDiffItem(DIFFITEM &di, bool & bExists, CDiffContext *pCtxt)
 		di.diffFileInfo[i].ClearPartial();
 		if (pCtxt->UpdateInfoFromDiskHalf(di, i))
 		{
-			di.diffcode.diffcode |= DIFFCODE::FIRST << i;
-			bExists = true;
+			if (di.diffFileInfo[i].IsDirectory() == di.diffcode.isDirectory())
+			{
+				di.diffcode.diffcode |= DIFFCODE::FIRST << i;
+				bExists = true;
+			}
+			else
+			{
+				di.diffFileInfo[i].ClearPartial();
+			}
 		}
 	}
 }