diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-12 19:47:43 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-12 19:47:43 +0100 |
| commit | fa387f9bef0d1a70a4b40c28c5cf9d661c421f73 (patch) | |
| tree | c1857d0d7fc0a8db8c1f3a841913b1f496d8e661 /src/core/common/Variant.cpp | |
| parent | 2b15fcab4b81fa8a854e724c48ee9c771fb126f8 (diff) | |
| parent | 55f943ba1b31542157b984b5955b91261c280f46 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Conflicts:
application/src/core/model/Document.hpp
Diffstat (limited to 'src/core/common/Variant.cpp')
| -rw-r--r-- | src/core/common/Variant.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/common/Variant.cpp b/src/core/common/Variant.cpp index e199bc7..81e6339 100644 --- a/src/core/common/Variant.cpp +++ b/src/core/common/Variant.cpp @@ -158,8 +158,10 @@ const RttiType& Variant::getRttiType() const return RttiTypes::Map; case VariantType::FUNCTION: return RttiTypes::Function; - case VariantType::OBJECT: - return asObject()->type(); + case VariantType::OBJECT: { + Variant::objectType o = asObject(); + return (o == nullptr) ? RttiTypes::Nullptr : o->type(); + } } return RttiTypes::None; } |