X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_callbacks.c;h=38adc58d040738a8ce164238656367dee9d86474;hb=9dac5d0710b760ba04ebb6bbe9ee61041232c700;hp=d7c998a00061a19c1e637d5f27a57adeb0ec1733;hpb=d6ccf7c81bdad11e6902a258e8e21fdbe6b9f968;p=freeglut

diff --git a/src/freeglut_callbacks.c b/src/freeglut_callbacks.c
index d7c998a..38adc58 100644
--- a/src/freeglut_callbacks.c
+++ b/src/freeglut_callbacks.c
@@ -50,7 +50,7 @@ void FGAPIENTRY glutDisplayFunc( void (* callback)( void ) )
 {
     if( !callback )
         fgError( "Fatal error in program.  NULL display callback not "
-                 "permitted in GLUT 3.0+ or freeglut 2.0.1+\n" );
+                 "permitted in GLUT 3.0+ or freeglut 2.0.1+" );
     SET_CALLBACK( Display );
 }
 
@@ -106,7 +106,7 @@ void FGAPIENTRY glutTimerFunc( unsigned int timeOut, void (* callback)( int ),
     {
         if( ! (timer = malloc(sizeof(SFG_Timer))) )
             fgError( "Fatal error: "
-                     "Memory allocation failure in glutTimerFunc()\n" );
+                     "Memory allocation failure in glutTimerFunc()" );
     }
 
     timer->Callback  = callback;
@@ -171,6 +171,8 @@ void FGAPIENTRY glutJoystickFunc( void (* callback)
                                   ( unsigned int, int, int, int ),
                                   int pollInterval )
 {
+    fgInitialiseJoysticks ();
+
     SET_CALLBACK( Joystick );
     fgStructure.Window->State.JoystickPollRate = pollInterval;