Set kill_recv on stream end

This commit is contained in:
James Booth
2015-06-06 20:19:58 +01:00
parent 5a857fc6c5
commit c96e902472

View File

@@ -144,8 +144,8 @@ read_stream(void)
log_println("RECV: </stream:stream>"); log_println("RECV: </stream:stream>");
log_println("--> Stream end callback fired"); log_println("--> Stream end callback fired");
write_stream(STREAM_END); write_stream(STREAM_END);
_shutdown(); log_println("STREAM END");
return 0; kill_recv = TRUE;
} }
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
} }
@@ -380,8 +380,11 @@ server_send(char *stream)
void void
server_stop(void) server_stop(void)
{ {
kill_recv = TRUE; if (!kill_recv) {
pthread_join(server_thread, NULL); log_println("SERVER STOP");
kill_recv = TRUE;
pthread_join(server_thread, NULL);
}
} }
static void static void