* background.c (background_attention): Unregister task before
calling message() to avoid recursion. (message_3s): Fix the number of arguments.
Этот коммит содержится в:
родитель
6da33f9c8c
Коммит
636d457a87
@ -1,5 +1,9 @@
|
|||||||
2003-10-25 Pavel Roskin <proski@gnu.org>
|
2003-10-25 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* background.c (background_attention): Unregister task before
|
||||||
|
calling message() to avoid recursion.
|
||||||
|
(message_3s): Fix the number of arguments.
|
||||||
|
|
||||||
* command.c (enter): Don't change current_dlg to NULL. It
|
* command.c (enter): Don't change current_dlg to NULL. It
|
||||||
breaks repainting of the panels. Simplify logic.
|
breaks repainting of the panels. Simplify logic.
|
||||||
|
|
||||||
|
@ -260,12 +260,14 @@ background_attention (int fd, void *closure)
|
|||||||
if (bytes < (sizeof (routine))){
|
if (bytes < (sizeof (routine))){
|
||||||
char *background_process_error = _(" Background process error ");
|
char *background_process_error = _(" Background process error ");
|
||||||
|
|
||||||
|
unregister_task_running (ctx->pid, fd);
|
||||||
|
waitpid (ctx->pid, &status, 0);
|
||||||
|
|
||||||
if (errno == ECHILD)
|
if (errno == ECHILD)
|
||||||
message (1, background_process_error, _(" Child died unexpectedly "));
|
message (1, background_process_error, _(" Child died unexpectedly "));
|
||||||
else
|
else
|
||||||
message (1, background_process_error, _(" Unknown error in child "));
|
message (1, background_process_error, _(" Unknown error in child "));
|
||||||
unregister_task_running (ctx->pid, fd);
|
|
||||||
waitpid (ctx->pid, &status, 0);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -495,7 +497,7 @@ message_3s (int flags, char *title, const char *str1,
|
|||||||
const char *str2, const char *str3)
|
const char *str2, const char *str3)
|
||||||
{
|
{
|
||||||
if (we_are_background)
|
if (we_are_background)
|
||||||
parent_call ((void *)real_message_3s, NULL, 3, sizeof (flags), &flags,
|
parent_call ((void *)real_message_3s, NULL, 5, sizeof (flags), &flags,
|
||||||
strlen (title), title, strlen (str1), str1,
|
strlen (title), title, strlen (str1), str1,
|
||||||
strlen (str2), str2, strlen (str3), str3);
|
strlen (str2), str2, strlen (str3), str3);
|
||||||
else
|
else
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user