From: Jason Rumney <jasonr@gnu.org>
Date: Mon, 12 Nov 2001 23:25:13 +0000 (+0000)
Subject: (Fx_open_connection): Only execute once.
X-Git-Tag: emacs-21.2~327
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ae07fe8011e6ab760d824243ce7bac47430d077a;p=emacs.git

(Fx_open_connection): Only execute once.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index 35b4013f47e..29ba92c77c7 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7548,6 +7548,11 @@ terminate Emacs if we can't open the connection.")
   unsigned char *xrm_option;
   struct w32_display_info *dpyinfo;
 
+  /* If initialization has already been done, return now to avoid
+     overwriting critical parts of one_w32_display_info.  */
+  if (w32_in_use)
+    return Qnil;
+
   CHECK_STRING (display, 0);
   if (! NILP (xrm_string))
     CHECK_STRING (xrm_string, 1);