diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-09-22 09:00:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-22 09:00:01 +0200 |
commit | 9906aeb2f8b492e6662e68aafe11e62524a87cc8 (patch) | |
tree | 61f479d3b83fafc419a348835ed823b350f3dc2f /core/object.cpp | |
parent | f6c94e62850c2418b4ccfe2bf6393974cc435f8d (diff) | |
parent | 1a97d6455d05320eef5ab9da7a7b0528d791be4f (diff) |
Merge pull request #11485 from rosshadden/fix/typos
Fixed a bunch of typos, including an error code.
[ci skip]
Diffstat (limited to 'core/object.cpp')
-rw-r--r-- | core/object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/object.cpp b/core/object.cpp index b1770f1d7a..823cbe14d4 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1052,7 +1052,7 @@ Variant Object::_emit_signal(const Variant **p_args, int p_argcount, Variant::Ca Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int p_argcount) { if (_block_signals) - return ERR_CANT_AQUIRE_RESOURCE; //no emit, signals blocked + return ERR_CANT_ACQUIRE_RESOURCE; //no emit, signals blocked Signal *s = signal_map.getptr(p_name); if (!s) { |