joystick updates from John Fay

[freeglut] / src / freeglut_callbacks.c

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 705c3d6..3e19c3e 100644 (file)
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -128,7 +128,7 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
 static void fghVisibility( int status )
 {
     int glut_status = GLUT_VISIBLE;
-    
+
     freeglut_assert_ready;
     freeglut_return_if_fail( fgStructure.Window );
 
@@ -171,6 +171,13 @@ void FGAPIENTRY glutJoystickFunc( void (* callback)
                                   ( unsigned int, int, int, int ),
                                   int pollInterval )
 {
+    if( !fgState.JoysticksInitialised )
+    {
+        fgJoystickInit( 0 );
+        fgJoystickInit( 1 );
+        fgState.JoysticksInitialised = GL_TRUE;
+    }
+
     SET_CALLBACK( Joystick );
     fgStructure.Window->State.JoystickPollRate = pollInterval;