enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

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.
This commit is contained in:
Carsten Haitzler 2020-07-12 09:52:51 +01:00
parent 1e3fcd263e
commit 5d69d2be2e
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/e_start_main.c
View File

@ -795,7 +795,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;
@ -836,14 +839,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)
{