Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89 from OoliteProject/weakref-js-fix

Browse Source 
Possible fix for weakref/JS bug on GCC 4.6 - issue #76
This commit is contained in:
cim 2014-04-17 17:34:27 +01:00
commit e68caf1aea
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Scripting/OOJavaScriptEngine.m
View File

@ -1297,7 +1297,23 @@ static JSObject *JSObjectFromNSDictionary(JSContext *context, NSDictionary *dict
{
if ([key isKindOfClass:[NSString class]] && [key length] != 0)
{
#ifndef __GNUC__
value = [[dictionary objectForKey:key] oo_jsValueInContext:context];
#else
#if __GNUC__ > 4 || __GNUC_MINOR__ > 6
value = [[dictionary objectForKey:key] oo_jsValueInContext:context];
#else
// GCC before 4.7 seems to have problems with this
// bit if the object is a weakref, causing crashes
// in docking code.
id tmp = [dictionary objectForKey:key];
if ([tmp respondsToSelector:@selector(weakRefUnderlyingObject)])
{
tmp = [tmp weakRefUnderlyingObject];
}
value = [tmp oo_jsValueInContext:context];
#endif
#endif
if (!JSVAL_IS_VOID(value))
{
OK = JS_SetPropertyById(context, result, OOJSIDFromString(key), &value);