--- supertuxkart-0.2/src/gui/race_gui.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.cpp	2006-10-06 11:25:23.000000000 +0200
@@ -144,24 +144,6 @@
 } // keybd
 
 // -----------------------------------------------------------------------------
-void RaceGUI::stick(const int &whichAxis, const float &value){
-  KartControl controls;
-  controls.data[whichAxis] = value;
-  assert(world != NULL);
-  world -> getPlayerKart(0) -> incomingJoystick ( controls );
-}   // stick
-
-// -----------------------------------------------------------------------------
-void RaceGUI::joybuttons( int whichJoy, int hold, int presses, int releases ) {
-  KartControl controls;
-  controls.buttons = hold;
-  controls.presses = presses;
-  controls.releases = releases;
-  assert(world != NULL);
-  world -> getPlayerKart(whichJoy) -> incomingJoystick ( controls );
-}   // joybuttons
-
-// -----------------------------------------------------------------------------
 void RaceGUI::drawFPS () {
   if (++fpsCounter>=50) {
     fpsTimer.update();
--- supertuxkart-0.2/src/gui/race_gui.hpp.joy1	2006-09-07 12:08:13.000000000 +0200
+++ supertuxkart-0.2/src/gui/race_gui.hpp	2006-10-06 11:25:23.000000000 +0200
@@ -42,8 +42,6 @@
   void select() {}
   void keybd(int key);
   void point(int x, int y) { (void)x; (void)y; }
-  void stick     (const int &whichAxis, const float &value) ;
-  void joybuttons(int whichJoy, int hold, int presses, int releases ) ;
 
 private:
     ulClock   fpsTimer;
--- supertuxkart-0.2/src/plibdrv.cpp.joy1	2006-10-06 11:25:23.000000000 +0200
+++ supertuxkart-0.2/src/plibdrv.cpp	2006-10-06 11:30:25.000000000 +0200
@@ -27,6 +27,7 @@
 
 #include "gui/menu_manager.hpp"
 #include "kart_control.hpp"
+#include "world.hpp"
 
 /*********************************\
 *                                 *
@@ -79,13 +80,21 @@
       static KartControl controls;
       int prev_buttons = controls.buttons;
       joystick->read ( &controls.buttons, controls.data) ;
-      menu->stick( 0, controls.data[0]);
-      menu->stick( 1, controls.data[1]);
 
       int changed_states = prev_buttons ^ controls.buttons;
       controls.presses = controls.buttons & changed_states;
       controls.releases = !controls.buttons & changed_states;
-      menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      
+      if ( menu_manager->isCurrentMenu( MENUID_RACE ) )
+      {
+        world -> getPlayerKart(0) -> incomingJoystick ( controls );
+      }
+      else
+      {
+        menu->stick( 0, controls.data[0]);
+        menu->stick( 1, controls.data[1]);
+        menu->joybuttons(0, controls.buttons, controls.presses, controls.releases);
+      }
     }
   }
 }