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

3 files changed, 10 insertions, 3 deletions

diff --git a/readme.txt b/readme.txt
index 64bf5cdf..aa2b2742 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,9 @@
 xrdp 0.9.0
 
 Credits
-  This project is very much dependent on FreeRDP(was rdesktop), the work of
-  Matt Chapman and the FreeRDP team members, of which I'm a member.
+  This project is very much dependent on NeutrinoRDP, FreeRDP, rdesktop, and
+  the work of Matt Chapman and the NeutrinoRDP team members, of which I'm a
+  member.
 
   Mark from up 19.9 was the first to work with rdp server code.
 
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 32b2e6be..665d1138 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -684,9 +684,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;