refactored Bugfix

diff --git a/libfreerdp/core/transport.c b/libfreerdp/core/transport.c
index bd8d853..0ab37dd 100644 (file)
--- a/libfreerdp/core/transport.c
+++ b/libfreerdp/core/transport.c
@@ -997,8 +997,13 @@ int transport_check_fds(rdpTransport* transport)
                ResetEvent(transport->rereadEvent);
        }
 
-       while (!freerdp_shall_disconnect(transport->context->instance) && (now < dueDate))
+       while (now < dueDate)
        {
+
+               if (freerdp_shall_disconnect(transport->context->instance)) {
+                       return -1;
+               }
+
                /**
                 * Note: transport_read_pdu tries to read one PDU from
                 * the transport layer.
@@ -1053,10 +1058,6 @@ int transport_check_fds(rdpTransport* transport)
                transport->haveMoreBytesToRead = TRUE;
        }
 
-  if (freerdp_shall_disconnect(transport->context->instance)) {
-      return -1;
-  }
-
        return 0;
 }