Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-04 01:52:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #99864 from HuntJSparra/server-features-regression

Browse Source 
Fix `OS::has_feature()` skipping custom features
This commit is contained in:
Rémi Verschelde 2024-12-02 15:51:56 +01:00
commit acdffd0a14
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/os/os.cpp
View File

@ -536,14 +536,9 @@ bool OS::has_feature(const String &p_feature) {
return true;
}
if (has_server_feature_callback) {
return has_server_feature_callback(p_feature);
if (has_server_feature_callback && has_server_feature_callback(p_feature)) {
return true;
}
#ifdef DEBUG_ENABLED
else if (is_stdout_verbose()) {
WARN_PRINT_ONCE("Server features cannot be checked before RenderingServer has been created. If you are checking a server feature, consider moving your OS::has_feature call after INITIALIZATION_LEVEL_SERVERS.");
}
#endif
if (ProjectSettings::get_singleton()->has_custom_feature(p_feature)) {
return true;