Merge b89aef2f32 into 136a4edc5f

driver/others/blas_server_win32.c

@@ -460,14 +460,7 @@ int BLASFUNC(blas_thread_shutdown)(void) {
 
     for (i = 0; i < blas_num_threads - 1; i++) {
       // Could also just use WaitForMultipleObjects
-      DWORD wait_thread_value = WaitForSingleObject(blas_threads[i], 50);
-
-#ifndef OS_WINDOWSSTORE
-      // TerminateThread is only available with WINAPI_DESKTOP and WINAPI_SYSTEM not WINAPI_APP in UWP
-      if (WAIT_OBJECT_0 != wait_thread_value) {
-        TerminateThread(blas_threads[i],0);
-      }
-#endif
+      DWORD wait_thread_value = WaitForSingleObject(blas_threads[i], INFINITE);
 
       CloseHandle(blas_threads[i]);
     }