Darwin: Always set DISPLAY

We weren't setting $DISPLAY when we should be...
XQuartz · Dec 4, 2007 · c3c71a8 · c3c71a8
1 parent b0349d5
commit c3c71a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv) {
     }
 
     /* First check if launchd started us */
-    if(strncmp(argv[1], "--launchd", 9) == 0) {
+    if(argc == 2 && !strncmp(argv[1], "--launchd", 9)) {
         argc--;
         argv[1] = argv[0];
         argv++;

diff --git a/hw/darwin/apple/server-main.c b/hw/darwin/apple/server-main.c
@@ -512,7 +512,7 @@ start_client (void)
 	case 0:					/* child */
 		/* Setup environment */
 		temp = getenv("DISPLAY");
-		if (temp != NULL && temp[0] != 0)
+//		if (temp == NULL && temp[0] != 0)
 			setenv("DISPLAY", server_name, TRUE);
 
 		temp = getenv("PATH");