From 79dc8ff1e74723623a3ae6d203015634fc2f8e05 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Sat, 7 Sep 2019 15:50:38 +0200
Subject: [PATCH] minor changes

---
 src/entt/meta/factory.hpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/entt/meta/factory.hpp b/src/entt/meta/factory.hpp
index d3a398b6f6..96fb2d3191 100644
--- a/src/entt/meta/factory.hpp
+++ b/src/entt/meta/factory.hpp
@@ -248,11 +248,11 @@ class meta_factory {
 
     template<typename Node>
     bool duplicate(const ENTT_ID_TYPE identifier, const Node *node) ENTT_NOEXCEPT {
-        return node ? node->identifier == identifier || duplicate(identifier, node->next) : false;
+        return node && (node->identifier == identifier || duplicate(identifier, node->next));
     }
 
     bool duplicate(const meta_any &key, const internal::meta_prop_node *node) ENTT_NOEXCEPT {
-        return node ? node->key() == key || duplicate(key, node->next) : false;
+        return node && (node->key() == key || duplicate(key, node->next));
     }
 
     template<typename>
@@ -563,9 +563,13 @@ class meta_factory {
             &internal::meta_info<Type>::template dtor<Func>,
             type,
             [](meta_handle handle) {
-                return handle.type() == internal::meta_info<Type>::resolve()->meta()
-                        ? (std::invoke(Func, *handle.data<Type>()), true)
-                        : false;
+                const auto valid = (handle.type() == internal::meta_info<Type>::resolve()->meta());
+
+                if(valid) {
+                    std::invoke(Func, *handle.data<Type>());
+                }
+
+                return valid;
             },
             []() ENTT_NOEXCEPT -> meta_dtor {
                 return &node;