Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2022

Conversation

tjmprm77
Copy link
Contributor

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 as shown below.

Before executing "Refresh Selected":
01_before

After executing "Refresh Selected" for the directory:
02_after_dir

After executing "Refresh Selected" for the file:
03_after_file

This PR fixes this issue by changing 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.

…n "Refresh Selected" is performed by selecting an item that has a directory and file with the same name.

- 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.
@sdottaka sdottaka merged commit 1bbf7ff into WinMerge:master Feb 12, 2022
@sdottaka
Copy link
Member

Thank you!

@sdottaka sdottaka added this to the v2.16.19 milestone Feb 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants