Index: src/main.c
===================================================================
--- src/main.c	(revision 218)
+++ src/main.c	(working copy)
@@ -281,12 +281,6 @@
 #ifdef FEAT_SUN_WORKSHOP
     findYourself(params.argv[0]);
 #endif
-#if defined(FEAT_GUI) && !defined(MAC_OS_CLASSIC)
-    /* Prepare for possibly starting GUI sometime */
-    gui_prepare(&params.argc, params.argv);
-    TIME_MSG("GUI prepared");
-#endif
-
 #ifdef FEAT_CLIPBOARD
     clip_init(FALSE);		/* Initialise clipboard stuff */
     TIME_MSG("clipboard setup");
@@ -335,6 +329,12 @@
     exec_on_server(&params);
 #endif
 
+#if defined(FEAT_GUI) && !defined(MAC_OS_CLASSIC)
+    /* Prepare for possibly starting GUI sometime */
+    gui_prepare(&params.argc, params.argv);
+    TIME_MSG("GUI prepared");
+#endif
+
     /*
      * Figure out the way to work from the command name argv[0].
      * "vimdiff" starts diff mode, "rvim" sets "restricted", etc.