Fixes as per merge request

This commit is contained in:
Mathew Winters 2018-11-15 08:29:51 +13:00
parent f91a4d0b6e
commit 0e88eb5a91
2 changed files with 4 additions and 4 deletions

View File

@ -5,7 +5,7 @@ android {
buildToolsVersion = "28.0.3"
defaultConfig {
minSdkVersion 14
minSdkVersion 21
targetSdkVersion 28
vectorDrawables.useSupportLibrary = true
versionCode = 14

View File

@ -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;
}