From 0e88eb5a9187052ddbac40cd72d00bd88af76210 Mon Sep 17 00:00:00 2001 From: Mathew Winters Date: Thu, 15 Nov 2018 08:29:51 +1300 Subject: [PATCH] Fixes as per merge request --- client/Android/Studio/freeRDPCore/build.gradle | 2 +- client/Android/android_freerdp.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle index 63da9f20e..332aa9a9c 100644 --- a/client/Android/Studio/freeRDPCore/build.gradle +++ b/client/Android/Studio/freeRDPCore/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion = "28.0.3" defaultConfig { - minSdkVersion 14 + minSdkVersion 21 targetSdkVersion 28 vectorDrawables.useSupportLibrary = true versionCode = 14 diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c index 5cfb30ccc..a171cf899 100644 --- a/client/Android/android_freerdp.c +++ b/client/Android/android_freerdp.c @@ -619,8 +619,8 @@ disconnect: if (async_input && inputThread) { - wMessageQueue* input_queue = freerdp_get_message_queue(instance, FREERDP_INPUT_MESSAGE_QUEUE); - MessageQueue_PostQuit(input_queue, 0); + wMessageQueue* input_queue = freerdp_get_message_queue(instance, FREERDP_INPUT_MESSAGE_QUEUE); + MessageQueue_PostQuit(input_queue, 0); WaitForSingleObject(inputThread, INFINITE); CloseHandle(inputThread); } @@ -871,7 +871,7 @@ static jboolean JNICALL jni_freerdp_connect(JNIEnv* env, jclass cls, ctx = (androidContext*)inst->context; if (!(ctx->thread = CreateThread(NULL, 0, android_thread_func, - inst, 0, NULL))) + inst, 0, NULL))) { return JNI_FALSE; }