From 7d6bfe27abb8239e2371d3ea26b60392f8efc5fe Mon Sep 17 00:00:00 2001 From: leper Date: Mon, 1 May 2017 00:58:35 +0000 Subject: [PATCH] Clean up FromJSProperty a little. Patch by Vladislav. Differential Revision: https://code.wildfiregames.com/D399 This was SVN commit r19489. --- source/scriptinterface/ScriptConversions.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source/scriptinterface/ScriptConversions.h b/source/scriptinterface/ScriptConversions.h index fda093d0c9..1814123dfd 100644 --- a/source/scriptinterface/ScriptConversions.h +++ b/source/scriptinterface/ScriptConversions.h @@ -95,17 +95,14 @@ template static bool FromJSProperty(JSContext* cx, JS::HandleValue v JS::RootedObject obj(cx, &v.toObject()); bool hasProperty; - if (!JS_HasProperty(cx, obj, name, &hasProperty)) + if (!JS_HasProperty(cx, obj, name, &hasProperty) || !hasProperty) return false; JS::RootedValue value(cx); - if (!hasProperty || !JS_GetProperty(cx, obj, name, &value)) + if (!JS_GetProperty(cx, obj, name, &value)) return false; - if (!ScriptInterface::FromJSVal(cx, value, out)) - return false; - - return true; + return ScriptInterface::FromJSVal(cx, value, out); } #endif //INCLUDED_SCRIPTCONVERSIONS