Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:10:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
launchers/darwin/src/Interface.m
View file

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