From 8c06fc454cb485bd9cabe61cd83d051d3c396e3b Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 27 Jul 2020 11:15:21 +0100 Subject: [PATCH] e alert - use same exit codes as e for explicit restart/logout be consistent. --- src/bin/e_alert_main.c | 8 ++++---- src/bin/e_start_main.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c index 162c3ebc3..e7f2cf21e 100644 --- a/src/bin/e_alert_main.c +++ b/src/bin/e_alert_main.c @@ -61,12 +61,12 @@ mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED if (ev->button == RECOVER_BUTTON) { - ret = 2; + ret = 111; elm_exit(); } else if (ev->button == ABORT_BUTTON) { - ret = 1; + ret = 101; 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)) { - ret = 2; + ret = 111; elm_exit(); } else if (!strcmp(ev->key, ABORT_KEY)) { - ret = 1; + ret = 101; elm_exit(); } } diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c index 85c6eaa98..3907f3ad8 100644 --- a/src/bin/e_start_main.c +++ b/src/bin/e_start_main.c @@ -856,7 +856,8 @@ not_done: free(backtrace_str); 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)) {