MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 08:15:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1457 from whatdoineed2do/rcp-cleanup-bug

Browse Source 
[rcp] bug fix on deinit()
This commit is contained in:
ejurgensen 2022-04-24 17:39:45 +02:00 committed by GitHub
commit 8531a27235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/outputs/rcp.c
View File

@ -1100,11 +1100,15 @@ rcp_session_free(struct rcp_session *s)
free(s); free(s);
} }
static void static void
rcp_session_cleanup(struct rcp_session *rs) rcp_session_cleanup(struct rcp_session *rs)
{ {
struct rcp_session *s; struct rcp_session *s;
if (!rs)
return;
if (rs == rcp_sessions) if (rs == rcp_sessions)
rcp_sessions = rcp_sessions->next; rcp_sessions = rcp_sessions->next;
else else
@ -1113,9 +1117,12 @@ rcp_session_cleanup(struct rcp_session *rs)
; /* EMPTY */ ; /* EMPTY */
if (!s) if (!s)
DPRINTF(E_WARN, L_RCP, "WARNING: struct rcp_session not found in list; BUG!\n"); {
else DPRINTF(E_WARN, L_RCP, "WARNING: struct rcp_session (%s at %s) not found in list; BUG!\n", rs->devname, rs->address);
s->next = rs->next; return;
}
s->next = rs->next;
} }
outputs_device_session_remove(rs->device->id); outputs_device_session_remove(rs->device->id);
@ -1354,10 +1361,7 @@ rcp_deinit(void)
struct rcp_session *s; struct rcp_session *s;
for (s = rcp_sessions; rcp_sessions; s = rcp_sessions) for (s = rcp_sessions; rcp_sessions; s = rcp_sessions)
{ rcp_session_cleanup(s);
rcp_sessions = s->next;
rcp_session_cleanup(s);
}
} }
struct output_definition output_rcp = struct output_definition output_rcp =