Fix path with multiple slashes not being corrected on templates #52513
+1
−5
Conversation
This file contains 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
kdiduk
reviewed
Sep 10, 2021
core/config/project_settings.cpp
Outdated
| } | ||
|
|
||
| if (p_path.begins_with("res://") || p_path.begins_with("user://") || | ||
| if (resource_path == "" || p_path.begins_with("res://") || p_path.begins_with("user://") || |
There was a problem hiding this comment.
[Cosmetic] Wouldn't it be better to change the first condition resource_path == "" into resource_path.is_empty?
if (resource_path.is_empty() || p_path.begins_with("res://") || p_path.begins_with("user://") ||
There was a problem hiding this comment.
Yes, it's also more efficient, thanks for the tip 👍
rsubtil
force-pushed
the
fix_path_double_slash
branch
from
649e357
to
eef0327
Compare
akien-mga
approved these changes
Sep 20, 2021
akien-mga
added
the
cherrypick:3.x
|
Thanks! |
|
Cherry-picked for 3.4. |
akien-mga
removed
the
cherrypick:3.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #52507
Paths with multiple slashes like
res://folder//folder//folder//icon.pngwere not being simplified on export templates because these load from PCK files, and thusresource_pathis never set.