From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 14 Nov 2017 14:51:50 +0000 (+0100)
Subject: Don't open X11 display too early
X-Git-Tag: v1.8.90~74
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=727a70f03868b1734e73853f2f75a4e9e4aa9b61;p=tigervnc.git

Don't open X11 display too early

We have to wait until we've passed the command line arguments or
we might overlook a -display argument.
---

diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 0ca46af4..67013027 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -481,11 +481,6 @@ int main(int argc, char** argv)
 
   init_fltk();
 
-#if !defined(WIN32) && !defined(__APPLE__)
-  fl_open_display();
-  XkbSetDetectableAutoRepeat(fl_display, True, NULL);
-#endif
-
   Configuration::enableViewerParams();
 
   /* Load the default parameter settings */
@@ -521,6 +516,11 @@ int main(int argc, char** argv)
 
   mkvnchomedir();
 
+#if !defined(WIN32) && !defined(__APPLE__)
+  fl_open_display();
+  XkbSetDetectableAutoRepeat(fl_display, True, NULL);
+#endif
+
   CSecurity::upg = &dlg;
 #ifdef HAVE_GNUTLS
   CSecurityTLS::msg = &dlg;