asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22737 from DualMatrix/warn_sort_custom

Browse source 
Added a check in sort_custom that test whether the given method exists.
This commit is contained in:
Rémi Verschelde 2018-10-05 09:15:05 +02:00 committed by GitHub
commit fc6cf69a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/array.cpp
View file

@ -258,6 +258,7 @@ struct _ArrayVariantSortCustom {
Array &Array::sort_custom(Object *p_obj, const StringName &p_function) { Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {
ERR_FAIL_NULL_V(p_obj, *this); ERR_FAIL_NULL_V(p_obj, *this);
ERR_FAIL_COND_V(!p_obj->has_method(p_function), *this);
SortArray<Variant, _ArrayVariantSortCustom, true> avs; SortArray<Variant, _ArrayVariantSortCustom, true> avs;
avs.compare.obj = p_obj; avs.compare.obj = p_obj;