summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-02-19 16:51:32 +0100
committerGitHub <noreply@github.com>2020-02-19 16:51:32 +0100
commit4581a9373cb5ec6909e8657fc98be5cb69139384 (patch)
tree9897055476301d63a45518729c465b6c191cf1f6
parent05e610b78cee0f7b779254e45bffefa4fa0fd910 (diff)
parentcb0b5eae8c1a702987c0def9fd4e658d8cba2946 (diff)
Merge pull request #36359 from vnen/variant-reference-fix
Fix Ref(Variant) constructor to properly check the object type
-rw-r--r--core/reference.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/reference.h b/core/reference.h
index b01e0035a7..36e7d5c6a6 100644
--- a/core/reference.h
+++ b/core/reference.h
@@ -170,9 +170,9 @@ public:
return;
}
- Reference *r = Object::cast_to<Reference>(object);
+ T *r = Object::cast_to<T>(object);
if (r && r->reference()) {
- reference = static_cast<T *>(r);
+ reference = r;
}
}
@@ -226,9 +226,9 @@ public:
return;
}
- Reference *r = Object::cast_to<Reference>(object);
+ T *r = Object::cast_to<T>(object);
if (r && r->reference()) {
- reference = static_cast<T *>(r);
+ reference = r;
} else {
reference = nullptr;
}