frodovdr
/
octonet
mirror of https://github.com/DigitalDevices/octonet.git
1
0
Fork 0
Code Issues Releases Wiki Activity

correctly handle pid change in comformity mode

This commit is contained in:
Ralph Metzler 2015-10-03 13:06:52 +02:00
parent ae09795607
commit dab77defed
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
octoserve/octoserve.c
View File

@ -1391,11 +1391,9 @@ static int setup_session(struct oscon *con, int newtrans)
if (!str)
return -500;
if (conform) {
if (str->session != sess && merge_pids(sp, p) < 0)
if (conform && (str->session != sess) && merge_pids(sp, p))
return -455;
} else
merge_pids(sp, p);
merge_pids(sp, p);
if (str->session == sess) { /* stream owner */
merge_params(sp, p);