morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP into channels

Browse Source
This commit is contained in:
Marc-André Moreau
2012-10-02 11:02:09 -04:00
parent 610af773b3 7ef2ba88b4
commit c29b786819
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/Windows/wfreerdp.c
View File

@@ -526,7 +526,7 @@ int wfreerdp_run(freerdp* instance)
}
/* do the wait */
if (MsgWaitForMultipleObjects(fds_count, fds, FALSE, 1, QS_ALLINPUT) == WAIT_FAILED)
if (MsgWaitForMultipleObjects(fds_count, fds, FALSE, 1000, QS_ALLINPUT) == WAIT_FAILED)
{
printf("wfreerdp_run: WaitForMultipleObjects failed: 0x%04X\n", GetLastError());
break;

3
libfreerdp/core/transport.c
View File

@@ -390,6 +390,9 @@ int transport_check_fds(rdpTransport** ptransport)
STREAM* received;
rdpTransport* transport = *ptransport;
#ifdef _WIN32
WSAResetEvent(transport->tcp->wsa_event);
#endif
wait_obj_clear(transport->recv_event);
status = transport_read_nonblocking(transport);