[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master fc281e0df3: Prevent Haiku display from being opened multiple time
From: |
Po Lu |
Subject: |
master fc281e0df3: Prevent Haiku display from being opened multiple times |
Date: |
Mon, 21 Feb 2022 02:45:06 -0500 (EST) |
branch: master
commit fc281e0df3d6f3ea359eae440cdae7e65412c06d
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Prevent Haiku display from being opened multiple times
* src/haikufns.c (Fx_open_connection): Return if display
connection already exists.
---
src/haikufns.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/haikufns.c b/src/haikufns.c
index ea42dd0daa..69f502fb01 100644
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -1844,16 +1844,29 @@ DEFUN ("x-open-connection", Fx_open_connection,
Sx_open_connection,
doc: /* SKIP: real doc in xfns.c. */)
(Lisp_Object display, Lisp_Object resource_string, Lisp_Object
must_succeed)
{
- struct haiku_display_info *dpy_info;
+ struct haiku_display_info *dpyinfo;
CHECK_STRING (display);
if (NILP (Fstring_equal (display, build_string ("be"))))
- !NILP (must_succeed) ? fatal ("Bad display") : error ("Bad display");
- dpy_info = haiku_term_init ();
+ {
+ if (!NILP (must_succeed))
+ fatal ("Bad display");
+ else
+ error ("Bad display");
+ }
+
+ if (x_display_list)
+ return Qnil;
+
+ dpyinfo = haiku_term_init ();
- if (!dpy_info)
- !NILP (must_succeed) ? fatal ("Display not responding") :
- error ("Display not responding");
+ if (!dpyinfo)
+ {
+ if (!NILP (must_succeed))
+ fatal ("Display not responding");
+ else
+ error ("Display not responding");
+ }
return Qnil;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master fc281e0df3: Prevent Haiku display from being opened multiple times,
Po Lu <=