jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/neutrinolabs/xrdp into devel

Browse Source
This commit is contained in:
speidy 2014-04-22 04:23:49 +03:00
commit e17d2375ea
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sesman/chansrv/sound.c
View File

@ -1363,7 +1363,7 @@ read_raw_audio_data(void *arg)
}
strans->trans_data_in = sttrans_data_in;
g_snprintf(path, 255, CHANSRV_PORT_STR, g_display_num);
g_snprintf(path, 255, CHANSRV_PORT_OUT_STR, g_display_num);
if (trans_connect(strans, "", path, 100) != 0)
{

6
sesman/session.c
View File

@ -745,9 +745,15 @@ session_start_fork(int width, int height, int bpp, char *username,
temp->item->type = type;
temp->item->status = SESMAN_SESSION_STATUS_ACTIVE;
/*THREAD-FIX require chain lock */
lock_chain_acquire();
temp->next = g_sessions;
g_sessions = temp;
g_session_count++;
/*THREAD-FIX release chain lock */
lock_chain_release();
}
return display;