Apple: Fixed issue where display would not be passed correctly to the server if nolisten tcp was enabled.

1 files changed, 4 insertions, 1 deletions

diff --git a/startx.cpp b/startx.cpp
index c31ae10..d1d19d0 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -208,9 +208,12 @@ XCOMM process server arguments
 if [ x"$server" = x ]; then
     XCOMM if no server arguments or display either, use rc file instead
     if [ x"$serverargs" = x -a x"$display" = x ]; then
-	server="$defaultserverargs"
 #ifdef __APPLE__
+	server=$defaultserver
+	serverargs=$defaultserverargs
 	display="$defaultdisplay"
+#else
+	server="$defaultserverargs"
 #endif
     else
 	server=$defaultserver