mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Merge branch 'STABLE-BRANCH-2-4' into master
This commit is contained in:
commit
334f5d95c8
89 changed files with 3260 additions and 1400 deletions
|
@ -153,6 +153,8 @@ wait_child_thread (void *arg)
|
|||
name, WSTOPSIG (wstatus));
|
||||
goto again;
|
||||
}
|
||||
|
||||
assuan_set_flag (g->primary_ctx, ASSUAN_NO_WAITPID, 1);
|
||||
}
|
||||
#endif /*!HAVE_W32_SYSTEM*/
|
||||
|
||||
|
@ -166,8 +168,6 @@ wait_child_thread (void *arg)
|
|||
}
|
||||
else
|
||||
{
|
||||
assuan_set_flag (g->primary_ctx, ASSUAN_NO_WAITPID, 1);
|
||||
|
||||
for (sl = g->local_list; sl; sl = sl->next_local)
|
||||
{
|
||||
sl->invalid = 1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue