Merge pull request #16070 from huffman/fix/mac-launcher-read-stdout

BUGZ-1293: Fix mac launcher not correctly reading interface version
This commit is contained in:
Ryan Huffman 2019-08-19 14:12:09 -07:00 committed by GitHub
commit afc9863e17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -33,10 +33,11 @@
return 0;
}
NSFileHandle * fh = [standardOut fileHandleForReading];
NSData * data = [fh readDataToEndOfFile];
NSString * output = [NSString stringWithUTF8String:[data bytes]];
if (output == nil) {
NSFileHandle* fh = [standardOut fileHandleForReading];
NSData* data = [fh readDataToEndOfFile];
NSString* output = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
if (output == nil || [output length] == 0) {
NSDictionary * userInfo = @{
NSLocalizedDescriptionKey: NSLocalizedString(@"Couldn't start interface", nil)
};