Merge pull request #3119 from akallabeth/abort_event_reset
Resetting abortEvent only on connect and reconnect.
This commit is contained in:
commit
738f55a6a8
@ -312,8 +312,6 @@ BOOL rdp_client_disconnect(rdpRdp* rdp)
|
||||
{
|
||||
BOOL status;
|
||||
|
||||
ResetEvent(rdp->context->abortEvent);
|
||||
|
||||
if (rdp->settingsCopy)
|
||||
{
|
||||
freerdp_settings_free(rdp->settingsCopy);
|
||||
|
@ -383,6 +383,7 @@ BOOL freerdp_reconnect(freerdp* instance)
|
||||
BOOL status;
|
||||
rdpRdp* rdp = instance->context->rdp;
|
||||
|
||||
ResetEvent(instance->context->abortEvent);
|
||||
status = rdp_client_reconnect(rdp);
|
||||
|
||||
return status;
|
||||
|
@ -340,10 +340,7 @@ BOOL rdp_read_header(rdpRdp* rdp, wStream* s, UINT16* length, UINT16* channelId)
|
||||
return FALSE;
|
||||
|
||||
if (!rdp->instance)
|
||||
{
|
||||
freerdp_abort_connect(rdp->instance);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
context = rdp->instance->context;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user