Skip to content

Degrade logging errors from ClassDB in some cases #118081

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.

Sign up for GitHub

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

Open
Ivorforce wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −4
Open

Degrade logging errors from ClassDB in some cases #118081

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions core/object/class_db.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,9 @@ void ClassDB::get_integer_constant_list(const StringName &p_class, List<String>
Locker::Lock lock(Locker::STATE_READ);

ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_NULL(type);
if (!type) {
return;
}

for (const KeyValue<StringName, int64_t> &E : type->gdtype->get_integer_constant_map(p_no_inheritance)) {
p_constants->push_back(E.key);
Expand Down Expand Up @@ -1207,10 +1209,14 @@ void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_
Locker::Lock lock(Locker::STATE_READ);

ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_NULL(type);
if (!type) {
return;
}

const GDType::EnumInfo *const *enum_info = type->gdtype->get_enum_map(p_no_inheritance).getptr(p_enum);
ERR_FAIL_NULL(enum_info);
if (!enum_info) {
return;
}

for (const KeyValue<StringName, int64_t> &kv : (*enum_info)->values) {
p_constants->push_back(kv.key);
Expand Down Expand Up @@ -1282,7 +1288,9 @@ void ClassDB::get_signal_list(const StringName &p_class, List<MethodInfo> *p_sig
Locker::Lock lock(Locker::STATE_READ);

ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_NULL(type);
if (!type) {
return;
}

for (const KeyValue<StringName, const MethodInfo *> &kv : type->gdtype->get_signal_map(p_no_inheritance)) {
p_signals->push_back(*kv.value);
Expand Down
Loading