From e0227cf536b2fe96a442588749b3a42d61645584 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 12 Jul 2020 09:52:51 +0100 Subject: [PATCH] e start - handle exit code for restart AND exit choices because of lib so library somewhere is causing an exit(1) sometimes... this means i lose my entire desktop. this is not e doing it... so it's some dependency bug and this shouldn't happen - but it does and it causes the entire login session to be losst, so treat an exit code ofr 0 as a clean exit, and anything else as a bug to be handled like segfaults etc. and restart e. --- src/bin/e_start_main.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c index a89919909..a18f4daa9 100644 --- a/src/bin/e_start_main.c +++ b/src/bin/e_start_main.c @@ -814,7 +814,10 @@ not_done: if (result == child) { - if (WIFSTOPPED(status) && !stop_ptrace) + printf("WIFSTOPPED=%i WIFEXITED=%i WEXITSTATUS=%i stop_ptrace=%i\n", + WIFSTOPPED(status), WIFEXITED(status), + WEXITSTATUS(status), stop_ptrace); + if (WIFSTOPPED(status) && (!stop_ptrace)) { char *backtrace_str = NULL; @@ -855,14 +858,28 @@ not_done: if (getenv("DISPLAY")) kill(child, SIGKILL); if (WEXITSTATUS(r) == 1) restart = EINA_FALSE; } + else if (!WIFEXITED(status) || (stop_ptrace)) + { + restart = EINA_TRUE; + done = EINA_TRUE; + } else if (WEXITSTATUS(status) == 111) { putenv("E_RESTART_OK=1"); restart = EINA_TRUE; done = EINA_TRUE; } - else if (!WIFEXITED(status) || stop_ptrace) - done = EINA_TRUE; + else if (WEXITSTATUS(status) == 0) + { + restart = EINA_FALSE; + done = EINA_TRUE; + } + else + { + printf("Invalid exit from enlightenment: code=%i\n", WEXITSTATUS(status)); + restart = EINA_TRUE; + done = EINA_TRUE; + } } else if (result == -1) {