diff --git a/Oolite.xcodeproj/project.pbxproj b/Oolite.xcodeproj/project.pbxproj index 55ae3031..9806a090 100644 --- a/Oolite.xcodeproj/project.pbxproj +++ b/Oolite.xcodeproj/project.pbxproj @@ -4046,7 +4046,6 @@ COPY_PHASE_STRIP = NO; HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)"; HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\""; - MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = "-DLOADSAVEGUI"; }; name = Debug; @@ -4057,7 +4056,6 @@ buildSettings = { HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)"; HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\""; - MACOSX_DEPLOYMENT_TARGET = 10.4; OTHER_CFLAGS = "-DLOADSAVEGUI"; }; name = Deployment; diff --git a/src/Core/Scripting/OOJSGlobal.m b/src/Core/Scripting/OOJSGlobal.m index 3951e6c8..0b0e6653 100644 --- a/src/Core/Scripting/OOJSGlobal.m +++ b/src/Core/Scripting/OOJSGlobal.m @@ -239,7 +239,7 @@ static JSBool GlobalLog(JSContext *context, uintN argc, jsval *vp) } else { - messageClass = OOStringFromJSValue(context, OOJS_ARGV[0]); + messageClass = OOStringFromJSValueEvenIfNull(context, OOJS_ARGV[0]); message = [NSString concatenationOfStringsFromJavaScriptValues:OOJS_ARGV + 1 count:argc - 1 separator:@", " inContext:context]; }