# HG changeset patch
# User Fiore Martin <f.martin@qmul.ac.uk>
# Date 1426251736 0
# Node ID 46671fc7d6490ea79d5269a7277c3ee764b2955f
# Parent  011caca7515a48c7745f37b48cd443ed38e21f21
fixed "window" message bug and brought the message outside the haptic device monitor

diff -r 011caca7515a -r 46671fc7d649 native/OpenHaptics/XYPad/XYPad.sdf
Binary file native/OpenHaptics/XYPad/XYPad.sdf has changed
diff -r 011caca7515a -r 46671fc7d649 native/OpenHaptics/XYPad/XYPad.v12.suo
Binary file native/OpenHaptics/XYPad/XYPad.v12.suo has changed
diff -r 011caca7515a -r 46671fc7d649 native/OpenHaptics/XYPad/uk_ac_qmul_eecs_depic_jhapticgui_HapticDevice.cpp
--- a/native/OpenHaptics/XYPad/uk_ac_qmul_eecs_depic_jhapticgui_HapticDevice.cpp	Fri Feb 13 14:44:20 2015 +0000
+++ b/native/OpenHaptics/XYPad/uk_ac_qmul_eecs_depic_jhapticgui_HapticDevice.cpp	Fri Mar 13 13:02:16 2015 +0000
@@ -177,12 +177,6 @@
 
 	}
 
-	static bool once = false;
-	if (!once){
-		once = true;
-		send(Message("window.display", "", 0));
-	}
-
 	/* check if there is a message ready for the java thread */
 	bool messageReady = (env->GetBooleanField(*thisObj,messageReadyFieldID) == JNI_TRUE);
 	if(messageReady){
@@ -213,6 +207,12 @@
 	/* release the lock. HapticScene methods from now on can execute commands without deadlock risk */
 	MonitorExit(thisObj);
 
+	static bool once = false;
+	if (!once){
+		once = true;
+		send(Message("window", "", 0));
+	}
+
 	unsigned int messageUpdate = 0;
 	if(messageReady)
 		messageUpdate = scene->processMessage(message);
diff -r 011caca7515a -r 46671fc7d649 src/uk/ac/qmul/eecs/depic/jhapticgui/examples/XYPad.dll
Binary file src/uk/ac/qmul/eecs/depic/jhapticgui/examples/XYPad.dll has changed