Index: joy.c
===================================================================
--- joy.c	(revision 618)
+++ joy.c	(revision 619)
@@ -249,15 +249,12 @@
 
 	raydium_joy_init_vars();
 #ifndef WIN32
-	if(raydium_init_cli_option("joydev",name))
-	    raydium_joy=open(name,O_RDONLY|O_NONBLOCK);
-	else
-	{
-	raydium_joy=open("/dev/js0",O_RDONLY|O_NONBLOCK);
-	if(raydium_joy==-1)
+    
+    raydium_init_cli_option_default("joydev",name,"/dev/js0");
+    raydium_joy=open(name,O_RDONLY|O_NONBLOCK);
+    if(raydium_joy==-1)
 	    raydium_joy=open("/dev/input/js0",O_RDONLY|O_NONBLOCK);
 	}
-
 	raydium_init_cli_option_default("evdev",name,"/dev/input/event0");
 	    
 	raydium_joy_event_handle = open(name, O_RDWR);