Fix: merge issue with thread quit pipe

Signed-off-by: David Goulet <dgoulet@efficios.com>