diff options
| author | speidy <speidy@gmail.com> | 2014-04-22 04:23:49 +0300 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2014-04-22 04:23:49 +0300 |
| commit | e17d2375ea959079cef0539838f834a4e5643784 (patch) | |
| tree | 147f47483127da4cb064dd04bd573c77f635f2bd | |
| parent | 0f3a9184595eba0a26ee63ba3c625a1cf7fa3b18 (diff) | |
| parent | 4f4a7a8c8ccaafa742b45bfc30c321b7b58d8e58 (diff) | |
| download | xrdp-proprietary-e17d2375ea959079cef0539838f834a4e5643784.tar.gz xrdp-proprietary-e17d2375ea959079cef0539838f834a4e5643784.zip | |
Merge branch 'master' of https://github.com/neutrinolabs/xrdp into devel
| -rw-r--r-- | sesman/chansrv/sound.c | 2 | ||||
| -rw-r--r-- | sesman/session.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index eb299ecc..8c76c9bc 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -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) { diff --git a/sesman/session.c b/sesman/session.c index b68ed3f4..6b49a3fb 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -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; |