X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=3e19c3e083c2cee6d4de774fd6f34623e68d07c7;hb=fc3fee8fa830aaba7aaa585cb021d5867c89385d;hp=baaeee18562a955f31abcdcc88857a4b5f6b995a;hpb=c466a2b89f6e2984080ee387922319be57fdca14;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index baaeee1..3e19c3e 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 
@@ -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;