Merge branch 'master' of https://github.com/FreeRDP/FreeRDP.git

diff --cc client/X11/xf_interface.c
index c17b349,3d27a5b..3960a01
--- 1/client/X11/xfreerdp.c
--- 2/client/X11/xf_interface.c
+++ b/client/X11/xf_interface.c
@@@ -1259,9 -1186,11 +1186,10 @@@ void* xf_thread(void* param
  
        if (!status)
        {
-               xf_free(xfi);
-               return XF_EXIT_CONN_FAILED;
+               freerdp_client_free(xfi);
+               exit_code = XF_EXIT_CONN_FAILED;
+               ExitThread(exit_code);
        }
 -
        channels = instance->context->channels;
        settings = instance->context->settings;
  

diff --cc include/freerdp/freerdp.h
Simple merge

diff --cc include/freerdp/input.h
Simple merge

diff --cc libfreerdp/core/fastpath.c
Simple merge

diff --cc libfreerdp/core/freerdp.c
Simple merge