This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch feat/e-wl-proxy-planb
in repository enlightenment.
View the commit online.
commit b8ddd2d59c286512ea301d6863e73f6d80a80186
Author: [email protected] <[email protected]>
AuthorDate: Mon Jun 8 11:03:23 2026 -0600
fix(start): don't clobber preset E_WL_SOCKET; detect immediate proxy exit
---
src/bin/e_start_main.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 28017d138..9eebff41e 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -533,7 +533,7 @@ _e_wl_proxy_start(void)
/* the name clients will use (default wayland-0), inherited by the session */
if (!getenv("WAYLAND_DISPLAY")) env_set("WAYLAND_DISPLAY", "wayland-0");
/* the private socket E will create and the proxy will connect to */
- env_set("E_WL_SOCKET", "wayland-e");
+ if (!getenv("E_WL_SOCKET")) env_set("E_WL_SOCKET", "wayland-e");
myasprintf(&proxy_bin, "%s/e_wl_proxy", eina_prefix_bin_get(pfx));
@@ -555,6 +555,15 @@ _e_wl_proxy_start(void)
/* give the proxy a moment to create the public socket before E or clients
* race for it; the proxy connects to the backend lazily on first client. */
usleep(200000);
+
+ /* if the proxy died immediately (e.g. could not create its socket), don't
+ * pretend it is running — the caller continues without it. */
+ if (waitpid(pid, NULL, WNOHANG) == pid)
+ {
+ fprintf(stderr, "e_wl_proxy exited immediately; continuing without it\n");
+ return -1;
+ }
+
return pid;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
