Skip to content
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

Fix filesystem dock which allow to exist folders with the same name - e.g. AAA and aaa on Windows #22686

Closed
wants to merge 1 commit into from

Conversation

dualtagh
Copy link
Contributor

@dualtagh dualtagh commented Oct 3, 2018

Fixes #22475

The script editor doesn't actually create a new folder called "AAA", but it does add it to the FileSystem tree. Rescanning when a new script is added to refresh

@akien-mga
Copy link
Member

Moving to 3.2 milestone as we're about to enter the beta stage and release freeze for Godot 3.1. Only bug fixes against issues of the 3.1 milestone (or enhancements to core features of the 3.1 roadmap) will be considered until 3.1-stable is released.

Note: If it's merged after 3.1-stable is released, this change may be considered for cherry-picking into a later 3.1.x release.

@akien-mga akien-mga modified the milestones: 3.1, 3.2 Dec 14, 2018
@akien-mga akien-mga requested a review from groud October 4, 2019 12:04
@akien-mga
Copy link
Member

This needs a rebase to solve the merge conflicts and squash the two commits together, see PR workflow.

Otherwise I guess the changes seem safe enough.

@akien-mga akien-mga modified the milestones: 3.2, 4.0 Nov 7, 2019
@akien-mga
Copy link
Member

Moving to 4.0 milestone as we're now in release freeze for Godot 3.2, and this bugfix is not critical to merge now. It may still be cherry-picked for the 3.2.x branch once merged in master.

@Anutrix
Copy link
Contributor

Anutrix commented May 12, 2020

@dualtagh Requesting rebase.

@dualtagh
Copy link
Contributor Author

@Anutrix Done 👍

@Anutrix
Copy link
Contributor

Anutrix commented May 17, 2020

clang-format is failing.
Have a look at #33027.

editor/filesystem_dock.cpp Outdated Show resolved Hide resolved
@Chaosus Chaosus changed the title 22475: Godot allow to exist folders with the same name - e.g. AAA and aaa on windows Fix filesystem dock which allow to exist folders with the same name - e.g. AAA and aaa on windows Jun 6, 2021
@Chaosus Chaosus changed the title Fix filesystem dock which allow to exist folders with the same name - e.g. AAA and aaa on windows Fix filesystem dock which allow to exist folders with the same name - e.g. AAA and aaa on Windows Jun 6, 2021
@YuriSizov YuriSizov requested review from a team August 24, 2021 20:34
@KoBeWi
Copy link
Member

KoBeWi commented Aug 25, 2021

Seems like the PR is broken. These changes are irrelevant. Some rebase mistake?

@dualtagh dualtagh closed this Aug 25, 2021
@KoBeWi KoBeWi removed this from the 4.0 milestone Aug 25, 2021
@YeldhamDev YeldhamDev removed request for a team, akien-mga and groud August 25, 2021 21:08
@KoBeWi
Copy link
Member

KoBeWi commented Aug 25, 2021

@dualtagh Sorry I was misled by the title, but after looking into the issue this is actually correct. Although you don't need to create new method, you can connect directly to _rescan() if you use unbind():

make_script_dialog->connect("script_created", callable_mp(this, &FileSystemDock::_rescan).unbind(1));

However not only scripts have this issue. Same happens with resources and scenes. You could add _rescan() to _make_scene_confirm() and _resource_created() methods to prevent that.

Sorry again, if you make the changes, the PR could be finally merged.

@YuriSizov
Copy link
Contributor

I've reimplemented the PR as I think the original author doesn't participate anymore. I've still credited them for the initial effort, so thanks for that! 🙂

@YuriSizov YuriSizov closed this Aug 28, 2021
@YuriSizov YuriSizov removed the request for review from a team August 28, 2021 16:43
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.

Godot allow to exist folders with the same name - e.g. AAA and aaa on windows
8 participants