summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2020-11-23 10:42:44 +0100
committerPedro J. Estébanez <pedrojrulez@gmail.com>2020-11-23 10:42:44 +0100
commite79162ec4e7f7813a38d5df3b508a6dce65bb6d4 (patch)
treea7ae3386ad92765723c34199e6faa94ea2c4de49 /core
parenta248e6f8c324ead983d9cf4cc201ffda68ae5158 (diff)
Make warning about Reference singletons more accurate
Diffstat (limited to 'core')
-rw-r--r--core/config/engine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/config/engine.cpp b/core/config/engine.cpp
index 8e2ab094b0..26f8cdf840 100644
--- a/core/config/engine.cpp
+++ b/core/config/engine.cpp
@@ -224,8 +224,9 @@ Engine::Singleton::Singleton(const StringName &p_name, Object *p_ptr) :
name(p_name),
ptr(p_ptr) {
#ifdef DEBUG_ENABLED
- if (Object::cast_to<Reference>(p_ptr)) {
- ERR_PRINT("A class intended to be used as a singleton must *not* inherit from Reference.");
+ Reference *ref = Object::cast_to<Reference>(p_ptr);
+ if (ref && !ref->is_referenced()) {
+ WARN_PRINT("You must use Ref<> to ensure the lifetime of a Reference object intended to be used as a singleton.");
}
#endif
}