enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

ensure pulse mixer always disconnects when requested 

SVN revision: 79292
This commit is contained in:
Mike Blumenkrantz 2012-11-14 12:33:52 +00:00
parent 62a83145f7
commit a3a8cc827c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/mixer/pa.c
View File

@ -749,8 +749,9 @@ pulse_connect(Pulse *conn)
void void
pulse_disconnect(Pulse *conn) pulse_disconnect(Pulse *conn)
{ {
Eina_Bool event = EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN(conn); EINA_SAFETY_ON_NULL_RETURN(conn);
if (conn->state == PA_STATE_INIT) return;
conn->state = PA_STATE_INIT; conn->state = PA_STATE_INIT;
if (conn->fdh) if (conn->fdh)
{ {
@ -758,13 +759,16 @@ pulse_disconnect(Pulse *conn)
conn->fdh = NULL; conn->fdh = NULL;
close(conn->fd); close(conn->fd);
conn->fd = -1; conn->fd = -1;
event = EINA_TRUE;
} }
else if (conn->svr) else if (conn->svr)
{ {
ecore_con_server_del(conn->svr); ecore_con_server_del(conn->svr);
conn->svr = NULL; conn->svr = NULL;
event = EINA_TRUE;
} }
ecore_event_add(PULSE_EVENT_DISCONNECTED, conn, pulse_fake_free, NULL); if (event)
ecore_event_add(PULSE_EVENT_DISCONNECTED, conn, pulse_fake_free, NULL);
} }
void void