From 55ef10975e2e543ff99f7a75dd65722dc96ff873 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Mon, 18 Jul 2011 22:54:21 -0700 Subject: [PATCH] XQuartz: Add some sanity checking and a fallback for the bundle id. This way we'll print an error and still mostly work rather than crashing if someone installs XQuartz.app incorrectly or tries running the server within the build system rather than the installed system. Signed-off-by: Jeremy Huddleston (cherry picked from commit 88ad050f3c2f9f11bafb56a8cf777518795295a9) --- hw/xquartz/X11Application.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 17e6b2751..51ec21fa7 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -992,6 +992,11 @@ void X11ApplicationMain (int argc, char **argv, char **envp) { app_prefs_domain_cfstr = (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]; + if (app_prefs_domain_cfstr == NULL) { + ErrorF("X11ApplicationMain: Unable to determine bundle identifier. Your installation of XQuartz may be broken.\n"); + app_prefs_domain_cfstr = @BUNDLE_ID_PREFIX".X11"; + } + [NSApp read_defaults]; [NSBundle loadNibNamed:@"main" owner:NSApp]; [[NSNotificationCenter defaultCenter] addObserver:NSApp