styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e alert - use same exit codes as e for explicit restart/logout 

be consistent.
This commit is contained in:
Carsten Haitzler 2020-07-27 11:15:21 +01:00
parent 0e18714228
commit 8c06fc454c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_alert_main.c
View File

@ -61,12 +61,12 @@ mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED
if (ev->button == RECOVER_BUTTON) if (ev->button == RECOVER_BUTTON)
{ {
ret = 2; ret = 111;
elm_exit(); elm_exit();
} }
else if (ev->button == ABORT_BUTTON) else if (ev->button == ABORT_BUTTON)
{ {
ret = 1; ret = 101;
elm_exit(); elm_exit();
} }
} }
@ -78,12 +78,12 @@ key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED
if (!strcmp(ev->key, RECOVER_KEY)) if (!strcmp(ev->key, RECOVER_KEY))
{ {
ret = 2; ret = 111;
elm_exit(); elm_exit();
} }
else if (!strcmp(ev->key, ABORT_KEY)) else if (!strcmp(ev->key, ABORT_KEY))
{ {
ret = 1; ret = 101;
elm_exit(); elm_exit();
} }
} }

3
src/bin/e_start_main.c
View File

@ -856,7 +856,8 @@ not_done:
free(backtrace_str); free(backtrace_str);
if (getenv("DISPLAY")) kill(child, SIGKILL); if (getenv("DISPLAY")) kill(child, SIGKILL);
if (WEXITSTATUS(r) == 1) restart = EINA_FALSE; if (WEXITSTATUS(r) == 101) restart = EINA_FALSE;
done = EINA_TRUE;
} }
else if (!WIFEXITED(status) || (stop_ptrace)) else if (!WIFEXITED(status) || (stop_ptrace))
{ {