From 8f3c91e91b634adaca77dac6cf314445cceefc78 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan <jmccrohan@gmail.com>
Date: Fri, 19 Oct 2012 19:38:06 +0100
Subject: Imported Upstream version 2.1.8.20120912

---
 Java/phidget_jni.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'Java/phidget_jni.c')

diff --git a/Java/phidget_jni.c b/Java/phidget_jni.c
index 1ec7ca6..1a91e74 100644
--- a/Java/phidget_jni.c
+++ b/Java/phidget_jni.c
@@ -27,6 +27,13 @@ jmethodID serverConnectEvent_cons;
 jclass serverDisconnectEvent_class;
 jmethodID serverDisconnectEvent_cons;
 
+#ifdef _WINDOWS
+
+extern int useThreadSecurity;
+extern void destroyThreadSecurityAttributes();
+
+#endif
+
 jint JNICALL
 JNI_OnLoad(JavaVM *vm, void *reserved)
 {
@@ -36,6 +43,12 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 
 	ph_vm = vm;
 
+	// Don't set thread security when we're using Java -  this break events.
+	#ifdef _WINDOWS
+		useThreadSecurity = PFALSE;
+		destroyThreadSecurityAttributes();
+	#endif
+
 	result = (*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_4);
 	
 	if(result == JNI_EDETACHED)
-- 
cgit v1.2.3