--- np2/x11/main.c	2004/07/05 14:31:52	1.19
+++ np2/x11/main.c	2005/03/12 12:36:13	1.22
@@ -10,8 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -295,6 +293,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+	joymng_initialize();
 	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {
 		mouse_running(MOUSE_ON);
@@ -304,7 +303,6 @@ main(int argc, char *argv[])
 	sysmng_initialize();
 	taskmng_initialize();
 
-	joy_init();
 	pccore_init();
 	S98_init();
 
@@ -325,9 +323,11 @@ main(int argc, char *argv[])
 		}
 	}
 
+#if !defined(CPUCORE_IA32)
 	if (np2oscfg.resume) {
 		flagload(np2resumeext, "Resume", FALSE);
 	}
+#endif
 	sysmng_workclockreset();
 
 	drvmax = (argc < 4) ? argc : 4;
@@ -349,13 +349,16 @@ main(int argc, char *argv[])
 	pccore_cfgupdate();
 
 	mouse_running(MOUSE_OFF);
+	joymng_deinitialize();
 	S98_trash();
 
+#if !defined(CPUCORE_IA32)
 	if (np2oscfg.resume) {
 		flagsave(np2resumeext);
 	} else {
 		flagdelete(np2resumeext);
 	}
+#endif
 
 	pccore_term();
 	debugwin_destroy();