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

ulab-next
speidy 11 years ago
commit e17d2375ea

@ -1363,7 +1363,7 @@ read_raw_audio_data(void *arg)
} }
strans->trans_data_in = sttrans_data_in; 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) if (trans_connect(strans, "", path, 100) != 0)
{ {

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

Loading…
Cancel
Save