diff options
| author | Dorian Johnson <2011@dorianj.net> | 2011-06-24 23:24:16 +0400 |
|---|---|---|
| committer | Dorian Johnson <2011@dorianj.net> | 2011-06-24 23:24:16 +0400 |
| commit | 8cb6139ee7a71209f02a885da9c440e67f77b0d5 (patch) | |
| tree | a7006df1b8c8e59ae675061d990e4d92099616a9 | |
| parent | 19e0fdc8948e310bf3fff46eabc03cec2f1982e3 (diff) | |
| parent | d6c5514f191aada3c308b1bdda3a3d6f9f422193 (diff) | |
Merge remote branch 'upstream/master'
| -rw-r--r-- | channels/rdpdr/devman.c | 6 | ||||
| -rw-r--r-- | libfreerdp-utils/unicode.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/channels/rdpdr/devman.c b/channels/rdpdr/devman.c index 49e0d46..d14a051 100644 --- a/channels/rdpdr/devman.c +++ b/channels/rdpdr/devman.c @@ -103,11 +103,11 @@ devman_unregister_service(DEVMAN* devman, SERVICE* srv) if (pdev->service == srv) { - devman_unregister_device(devman, pdev); - devman_rewind(devman); - if (pdev->service->type == RDPDR_DTYP_SMARTCARD && pdev->service->control) pthread_cancel(scard_thread); + + devman_unregister_device(devman, pdev); + devman_rewind(devman); } } diff --git a/libfreerdp-utils/unicode.c b/libfreerdp-utils/unicode.c index dda7f96..c4c6fc7 100644 --- a/libfreerdp-utils/unicode.c +++ b/libfreerdp-utils/unicode.c @@ -17,6 +17,7 @@ limitations under the License. */ +#include "config.h" #include <errno.h> #include <freerdp/utils/memory.h> |