Fix FileDialog's root_subfolder on Windows#110524
Merged
Repiteo merged 1 commit intogodotengine:masterfrom Nov 13, 2025
Merged
Conversation
fire
changed the title
KoBeWi
approved these changes
Sep 27, 2025
Contributor
|
Could you squash your commits? See our pull request guidelines for more information |
`root_prefix` either contains an empty string or the current root including the drive letter. This means that the previous logic would never ever match since `dir_access->get_current_dir(false)` explicitly excludes the drive letter. This change removes this boolean parameter so we compare paths in a way that can match. I've had a look at the implementations for other platforms for `DirAccess::get_current_dir(bool include_drive)` and outside Windows none seem to consider the `include_drive` parameter which makes me believe that this change won't break other platforms.
paul-marechal
force-pushed
the
filedialog-windows-fix
branch
from
b90aaf2 to
375f88d
Compare
Contributor
Author
|
In case me pushing the squashed commit didn't notify you: the change should now be ready to merge |
Contributor
|
Thanks! |
akien-mga
changed the title
root_subfolder on Windows
akien-mga
changed the title
root_subfolder on Windowsroot_subfolder on Windows
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
root_prefixeither contains an empty string or the current root including the drive letter. This means that the previous logic would never ever match sincedir_access->get_current_dir(false)explicitly excludes the drive letter.This change removes this boolean parameter so we compare paths in a way that can match.
I've had a look at the implementations for other platforms for
DirAccess::get_current_dir(bool include_drive)and outside Windows none seem to consider theinclude_driveparameter which makes me believe that this change won't break other platforms.Fixes #79513