From 6a27c4ccabd08ea2fb2d85d2cc12cb51dc97a80e Mon Sep 17 00:00:00 2001 From: Mariusz Bialonczyk Date: Sat, 24 Jan 2015 14:06:27 +0100 Subject: [PATCH] Fix 519ec96 (capmt: network mode: fix a crash when oscam is restarted) When there was a further subscribing requests, the queued greeting could be queued not as the first position in the queue, leading to problems when subscribing the channel. Now requesting to flush the queue in capmt_notify_server() to be sure that the greeting go out to OSCam as a first command. --- src/descrambler/capmt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index f7e77328..7d75cf75 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -916,6 +916,10 @@ capmt_stop_filter(capmt_t *capmt, int adapter, sbuf_t *sb, int offset) static void capmt_notify_server(capmt_t *capmt, capmt_service_t *ct, int force) { + /* flush out the greeting */ + if (capmt->capmt_oscam == CAPMT_OSCAM_NET_PROTO) + capmt_flush_queue(capmt, 0); + pthread_mutex_lock(&capmt->capmt_mutex); if (capmt_oscam_new(capmt)) { if (!LIST_EMPTY(&capmt->capmt_services))