diff --git a/trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp b/trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp
index 9d1e85c..0d1a8de 100644
--- a/trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp
+++ b/trunk/dev/MSDK/MGui/Sources/X11/MJoystickLinux.cpp
@@ -104,12 +104,12 @@ void MJoystickLinux::updateData()
 	if(m_file == -1)
 		return;

+	fsync(m_file);
 	read(m_file, &m_js, sizeof(struct js_event));

 	switch(m_js.type & ~JS_EVENT_INIT)
 	{
 		case JS_EVENT_AXIS:
-			//m_dAxis[m_js.number] = m_axis[m_js.number];
 			m_axis[m_js.number] = m_js.value;
 			m_dAxis[m_js.number] = m_js.value;
 			m_dAxis[m_js.number] /= (float) JOY_AXIS_MAX;
@@ -122,15 +122,3 @@ void MJoystickLinux::updateData()

 }

-int main(int argc, char* argv[])
-{
-	MJoystickLinux joystick(JOY1_DEV);
-
-	while(1)
-	{
-		joystick.updateData();
-
-		printf("Axis x = %f\n", joystick.getDeltaAxis(0));
-		fflush(stdout);
-	}
-}
\ No newline at end of file
diff --git a/trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp b/trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp
index 2bc7b73..d3d55b4 100644
--- a/trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp
+++ b/trunk/dev/MSDK/MGui/Sources/X11/MX11Window.cpp
@@ -213,7 +213,7 @@ static int translateKey(int keycode)

 #ifdef linux
 static void updateJoystick(MJoystick* joystick, MJoystickLinux* joystickLinux,
-			   MWindow* window)
+			   MWindow* window, MWIN_EVENT_TYPE event)
 {
 	joystickLinux->updateData();

@@ -234,12 +234,12 @@ static void updateJoystick(MJoystick* joystick, MJoystickLinux* joystickLinux,
 	joystick->setX(joystickLinux->getDeltaAxis(0));
 	joystick->setY(joystickLinux->getDeltaAxis(1));
 	joystick->setZ(joystickLinux->getDeltaAxis(2));
-	joystick->setR(joystickLinux->getDeltaAxis(3));
-	joystick->setU(joystickLinux->getDeltaAxis(4));
+	joystick->setU(joystickLinux->getDeltaAxis(3));
+	joystick->setR(joystickLinux->getDeltaAxis(4));
 	joystick->setV(joystickLinux->getDeltaAxis(5));

 	MWinEvent events;
-	events.type = MWIN_EVENT_JOYSTICK1_UPDATE;
+	events.type = event; // MWIN_EVENT_JOYSTICK1_UPDATE;
 	window->sendEvents(&events);

 	joystick->flush();
@@ -575,10 +575,10 @@ bool MWindow::onEvents(void)
 	MWindow* window = MWindow::getInstance();

 	MJoystick* joystick = window->getJoystick1();
-	updateJoystick(joystick, &joystick1, window);
+	updateJoystick(joystick, &joystick1, window, MWIN_EVENT_JOYSTICK1_UPDATE);

 	joystick = window->getJoystick2();
-	updateJoystick(joystick, &joystick2, window);
+	updateJoystick(joystick, &joystick2, window, MWIN_EVENT_JOYSTICK2_UPDATE);
 #endif

 	return true;