ui/ncurses: Use pmenu_item destrutor to free ncurses ITEMs

[petitboot] / discover / paths.c

diff --git a/discover/paths.c b/discover/paths.c
index 5e577ebc7baeee7b96871339acbb6279fcc3cb56..54774cf3b6135cb9ffdac41b0f3f731e7699d1b0 100644 (file)
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -86,7 +86,7 @@ static void load_url_process_exit(struct process *process)
 
        if (result->status == LOAD_CANCELLED) {
                load_url_result_cleanup_local(result);
-       } else if (process->exit_status == 0) {
+       } else if (process_exit_ok(process)) {
                result->status = LOAD_OK;
        } else {
                result->status = LOAD_ERROR;
@@ -131,7 +131,10 @@ static void load_process_to_local_file(struct load_task *task,
                task->result->status = rc ? LOAD_ERROR : LOAD_ASYNC;
        } else {
                rc = process_run_sync(task->process);
-               task->result->status = rc ? LOAD_ERROR : LOAD_OK;
+               if (rc || !process_exit_ok(task->process))
+                       task->result->status = LOAD_ERROR;
+               else
+                       task->result->status = LOAD_OK;
                process_release(task->process);
                task->process = NULL;
        }