Ignore trailing slashes in new project’s path when disabling Create Folder #94015
Conversation
|
Your commit seems not to be linked to your GitHub account. See: Why are my commits linked to the wrong user? for more info. |
|
Apologies! I have added the commit header email address to my GitHub account, please let me know if there are any other issues |
| while (target_path.ends_with("/") || target_path.ends_with("\\")) { | ||
| target_path = target_path.substr(0, target_path.length() - 1); | ||
| } |
There was a problem hiding this comment.
| while (target_path.ends_with("/") || target_path.ends_with("\\")) { | |
| target_path = target_path.substr(0, target_path.length() - 1); | |
| } | |
| target_path = target_path.rstrip("/"); |
There was a problem hiding this comment.
Ah, much nicer! Any reason not to include backslash?
| while (target_path.ends_with("/") || target_path.ends_with("\\")) { | |
| target_path = target_path.substr(0, target_path.length() - 1); | |
| } | |
| target_path = target_path.rstrip("/\\"); |
There was a problem hiding this comment.
rstrip replaces all occurrences of a pattern from the right side, so it would only replace it if it ends with /\ with the proposed change.
If you want to strip both, you have to do them separately: target_path.rstrip("/").rstrip("\\")
Godot shouldn't be using backslashes in paths though, but I guess users might input them manually / copy from the Windows explorer, so that makes sense.
| @@ -315,6 +315,8 @@ void ProjectDialog::_create_dir_toggled(bool p_pressed) { | |||
| target_path = target_path.path_join(last_custom_target_dir); | |||
| } | |||
| } else { | |||
| // Strip any trailing slash. | |||
| target_path = target_path.rstrip("/").rstrip("\\") | |||
There was a problem hiding this comment.
Isn't a semi-colon ; needed at the end of the line?
| target_path = target_path.rstrip("/").rstrip("\\") | |
| target_path = target_path.rstrip("/").rstrip("\\"); |
There was a problem hiding this comment.
Absolutely 😅 I can't believe I missed that
|
Amended with the suggested change, however I'm still uncertain whether it requires one or two calls to On my machine it seems to successfully strip any combination of forward & back slashes with just If this is not intended it may be another issue and/or documentation discrepancy. |
Hm you are right, I commented from memory but indeed |
…older In the “Create New Project” dialog, disabling the “Create Folder” slider with a trailing slash in the project path would cause it to incorrectly identify the last path component as the substring following the slash, in other words, an empty string. By first discarding any trailing slashes when disabling the slider, the project dialog will now identify and pop the last path component as usual even when a trailing slash is present.
|
Thanks! And congrats for your first merged Godot contribution 🎉 |
In the “Create New Project” dialog, disabling the “Create Folder” slider with a trailing slash in the project path would cause it to incorrectly identify the last path component as the substring following the slash, in other words, an empty string.
By first discarding any trailing slashes when disabling the slider, the project dialog will now identify and pop the last path component as usual even when a trailing slash is present.
Fixes #93973