joystick init fixes (John Fay)

[freeglut] / src / freeglut_callbacks.c

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index 94c4dbd..38adc58 100644 (file)
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -171,12 +171,7 @@ void FGAPIENTRY glutJoystickFunc( void (* callback)
                                   ( unsigned int, int, int, int ),
                                   int pollInterval )
 {
-    if( !fgState.JoysticksInitialised )
-    {
-        fgJoystickInit( 0 );
-        fgJoystickInit( 1 );
-        fgState.JoysticksInitialised = GL_TRUE;
-    }
+    fgInitialiseJoysticks ();
 
     SET_CALLBACK( Joystick );
     fgStructure.Window->State.JoystickPollRate = pollInterval;