Skip to content

Commit a744ddb

Browse files
authored
Merge pull request #1230 from DickSmith/release
fix: don't crash app if flag is present
2 parents ceb6181 + 1792259 commit a744ddb

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

src/NativeScript/JSErrors.mm

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,18 @@ void reportFatalErrorBeforeShutdown(ExecState* execState, Exception* exception,
181181
CFRunLoopRunInMode((CFStringRef)TNSInspectorRunLoopMode, 0.1, false);
182182
}
183183
}
184-
185-
String message = exception->value().toString(globalObject->globalExec())->value(globalObject->globalExec());
186-
NSException* objcException = [NSException exceptionWithName:[NSString stringWithFormat:@"NativeScript encountered a fatal error: %s\n at \n%s",
187-
message.utf8().data(),
188-
jsCallstack.c_str()]
189-
reason:nil
190-
userInfo:@{ @"sender": @"reportFatalErrorBeforeShutdown" }];
191-
@throw objcException;
184+
185+
id discardExceptionsValue = [[TNSRuntime current] appPackageJson][@"discardUncaughtJsExceptions"];
186+
bool discardExceptions = [discardExceptionsValue boolValue];
187+
if (!discardExceptions) {
188+
String message = exception->value().toString(globalObject->globalExec())->value(globalObject->globalExec());
189+
NSException* objcException = [NSException exceptionWithName:[NSString stringWithFormat:@"NativeScript encountered a fatal error: %s\n at \n%s",
190+
message.utf8().data(),
191+
jsCallstack.c_str()]
192+
reason:nil
193+
userInfo:@{ @"sender": @"reportFatalErrorBeforeShutdown" }];
194+
@throw objcException;
195+
}
192196
}
193197
}
194198

0 commit comments

Comments
 (0)