--- np2/x11/main.c	2004/07/05 14:31:52	1.19
+++ np2/x11/main.c	2004/07/26 15:53:26	1.20
@@ -295,6 +295,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+	joymng_initialize();
 	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {
 		mouse_running(MOUSE_ON);
@@ -304,7 +305,6 @@ main(int argc, char *argv[])
 	sysmng_initialize();
 	taskmng_initialize();
 
-	joy_init();
 	pccore_init();
 	S98_init();
 
@@ -349,6 +349,7 @@ main(int argc, char *argv[])
 	pccore_cfgupdate();
 
 	mouse_running(MOUSE_OFF);
+	joymng_deinitialize();
 	S98_trash();
 
 	if (np2oscfg.resume) {