mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3119 from akallabeth/abort_event_reset

Browse Source 
Resetting abortEvent only on connect and reconnect.
This commit is contained in:
Bernhard Miklautz 2016-02-23 17:14:08 +01:00
commit 738f55a6a8
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/core/connection.c
View File

@ -312,8 +312,6 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
{ {
BOOL status; BOOL status;
ResetEvent(rdp->context->abortEvent);
if (rdp->settingsCopy) if (rdp->settingsCopy)
{ {
freerdp_settings_free(rdp->settingsCopy); freerdp_settings_free(rdp->settingsCopy);

1
libfreerdp/core/freerdp.c
View File

@ -383,6 +383,7 @@ BOOL freerdp_reconnect(freerdp* instance)
BOOL status; BOOL status;
rdpRdp* rdp = instance->context->rdp; rdpRdp* rdp = instance->context->rdp;
ResetEvent(instance->context->abortEvent);
status = rdp_client_reconnect(rdp); status = rdp_client_reconnect(rdp);
return status; return status;

3
libfreerdp/core/rdp.c
View File

@ -340,10 +340,7 @@ BOOL rdp_read_header(rdpRdp* rdp, wStream* s, UINT16* length, UINT16* channelId)
return FALSE; return FALSE;
if (!rdp->instance) if (!rdp->instance)
{
freerdp_abort_connect(rdp->instance);
return FALSE; return FALSE;
}
context = rdp->instance->context; context = rdp->instance->context;