diff --git a/launchers/darwin/images/HiFi_Voxel.png b/launchers/darwin/images/HiFi_Voxel.png new file mode 100644 index 0000000000..cd46b96c28 Binary files /dev/null and b/launchers/darwin/images/HiFi_Voxel.png differ diff --git a/launchers/darwin/images/HiFi_Window.png b/launchers/darwin/images/HiFi_Window.png new file mode 100644 index 0000000000..f9bf24c0fc Binary files /dev/null and b/launchers/darwin/images/HiFi_Window.png differ diff --git a/launchers/darwin/images/hifi_logo_large@2x.png b/launchers/darwin/images/hifi_logo_large@2x.png new file mode 100644 index 0000000000..d480da86dd Binary files /dev/null and b/launchers/darwin/images/hifi_logo_large@2x.png differ diff --git a/launchers/darwin/images/hifi_logo_small@2x.png b/launchers/darwin/images/hifi_logo_small@2x.png new file mode 100644 index 0000000000..b8782dd226 Binary files /dev/null and b/launchers/darwin/images/hifi_logo_small@2x.png differ diff --git a/launchers/darwin/images/hifi_window@2x.png b/launchers/darwin/images/hifi_window@2x.png new file mode 100644 index 0000000000..c7638fb61c Binary files /dev/null and b/launchers/darwin/images/hifi_window@2x.png differ diff --git a/launchers/darwin/images/interface.icns b/launchers/darwin/images/interface.icns new file mode 100644 index 0000000000..8dadfd5037 Binary files /dev/null and b/launchers/darwin/images/interface.icns differ diff --git a/launchers/darwin/src/updater/main.m b/launchers/darwin/src/updater/main.m index f8fe5a598c..a34fb12b77 100644 --- a/launchers/darwin/src/updater/main.m +++ b/launchers/darwin/src/updater/main.m @@ -12,7 +12,23 @@ } @end + +void redirectLogToDocuments() +{ + NSString* filePath = [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex:0] + stringByAppendingString:@"/Launcher/"]; + + if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]) { + NSError * error = nil; + [[NSFileManager defaultManager] createDirectoryAtPath:filePath withIntermediateDirectories:TRUE attributes:nil error:&error]; + } + NSString *pathForLog = [filePath stringByAppendingPathComponent:@"log.txt"]; + + freopen([pathForLog cStringUsingEncoding:NSASCIIStringEncoding],"a+",stderr); +} + int main(int argc, char const* argv[]) { + redirectLogToDocuments(); if (argc < 3) { NSLog(@"Error: wrong number of arguments"); return 0; @@ -50,6 +66,7 @@ int main(int argc, char const* argv[]) { options:NSWorkspaceLaunchNewInstance configuration:configuration error:&error]; + if (error != nil) { NSLog(@"couldn't start launcher: %@", error); return 1; diff --git a/launchers/qt/src/Helper_darwin.mm b/launchers/qt/src/Helper_darwin.mm index 422859fa67..6e306d795b 100644 --- a/launchers/qt/src/Helper_darwin.mm +++ b/launchers/qt/src/Helper_darwin.mm @@ -5,6 +5,8 @@ #import #include #include +#include +#include void launchClient(const QString& clientPath, const QString& homePath, const QString& defaultScriptOverride, const QString& displayName, const QString& contentCachePath, QString loginTokenResponse) { @@ -72,7 +74,7 @@ void launchAutoUpdater(const QString& autoUpdaterPath) { @throw exception; } - exit(0); + QCoreApplication::instance()->quit(); }