diff --git a/NativeScript/NativeScript.h b/NativeScript/NativeScript.h index f9bcc9f1..85b56f9e 100644 --- a/NativeScript/NativeScript.h +++ b/NativeScript/NativeScript.h @@ -1,14 +1,16 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface Config : NSObject @property (nonatomic, retain) NSString* BaseDir; -@property (nonatomic, retain) NSString* ApplicationPath; -@property (nonatomic) void* MetadataPtr; +@property (nonatomic, retain, nullable) NSString* ApplicationPath; +@property (nonatomic, nullable) void* MetadataPtr; @property BOOL IsDebug; @property BOOL LogToSystemConsole; @property int ArgumentsCount; -@property (nonatomic) char** Arguments; +@property (nonatomic) char* _Nullable* _Nullable Arguments; @end @@ -26,3 +28,5 @@ - (bool)liveSync; @end + +NS_ASSUME_NONNULL_END diff --git a/NativeScript/NativeScript.mm b/NativeScript/NativeScript.mm index 0ac0e10e..4efc7223 100644 --- a/NativeScript/NativeScript.mm +++ b/NativeScript/NativeScript.mm @@ -184,7 +184,9 @@ - (instancetype)initializeWithConfig:(Config*)config { new v8_inspector::JsV8InspectorClient(runtime_.get()); inspectorClient->init(); inspectorClient->registerModules(); - inspectorClient->connect([config ArgumentsCount], [config Arguments]); + // A nil Arguments array carries no inspector flags, whatever ArgumentsCount says. + inspectorClient->connect(config.Arguments != nullptr ? config.ArgumentsCount : 0, + config.Arguments); Console::AttachInspectorClient(inspectorClient); } }