From ba0deed93ba361dc9d3c11d97cb29cc2e74fb1d0 Mon Sep 17 00:00:00 2001 From: YoungHun Kim Date: Tue, 28 Nov 2017 16:32:56 +0900 Subject: [PATCH] Bug fix of product issue Change-Id: I3843adde3327d776bd4f851658c8cd9310768164 (cherry picked from commit f26a678cfa83142f005e1d6077122e67d5699456) --- packaging/mused.spec | 2 +- server/src/muse_server_private.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packaging/mused.spec b/packaging/mused.spec index 8450991..a7eb706 100644 --- a/packaging/mused.spec +++ b/packaging/mused.spec @@ -1,6 +1,6 @@ Name: mused Summary: A multimedia daemon -Version: 0.3.18 +Version: 0.3.19 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/server/src/muse_server_private.c b/server/src/muse_server_private.c index 2712a38..7a4e08c 100644 --- a/server/src/muse_server_private.c +++ b/server/src/muse_server_private.c @@ -283,13 +283,12 @@ static gboolean _ms_connection_handler(GIOChannel *source, GIOCondition conditio m->ch[MUSE_CHANNEL_MSG].sock_fd = client_sockfd; m->pid = pid; } else { - pid = _ms_get_pid(client_sockfd); instance_queue = ms_get_instance()->connection->instance_queue; length = g_queue_get_length(instance_queue); for (idx = 0; idx < length; idx++) { peeked_m = (muse_module_h)g_queue_peek_nth(instance_queue, idx); - if (peeked_m->pid == pid && peeked_m->idx == MUSE_PLAYER) { + if (peeked_m->pid == pid) { SECURE_LOGI("instance #%d - %s %p (%d)", idx, muse_server->conf->host[peeked_m->idx], peeked_m, peeked_m->pid); m = peeked_m; m->ch[MUSE_CHANNEL_DATA].sock_fd = client_sockfd; @@ -304,7 +303,7 @@ static gboolean _ms_connection_handler(GIOChannel *source, GIOCondition conditio } if (m == NULL) { - LOGW("[%d] channel %d failed to get module addr for muse_module_t", client_sockfd, channel); + LOGW("[%d] pid %d channel %d failed to get module addr for muse_module_t", pid, client_sockfd, channel); goto out; } -- 2.7.4