--- np2/x11/main.c	2004/06/17 14:36:33	1.18
+++ np2/x11/main.c	2004/08/14 03:12:51	1.21
@@ -138,7 +138,6 @@ main(int argc, char *argv[])
 	int rv = 1;
 	int ch;
 	int i, drvmax;
-	BOOL shared_pixmap_flag = FALSE;
 
 	progname = argv[0];
 
@@ -252,7 +251,7 @@ main(int argc, char *argv[])
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
 
-	use_shared_pixmap = np2oscfg.shared_pixmap && shared_pixmap_flag;
+	use_shared_pixmap = np2oscfg.shared_pixmap;
 
 	TRACEINIT();
 
@@ -296,6 +295,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+	joymng_initialize();
 	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {
 		mouse_running(MOUSE_ON);
@@ -305,7 +305,6 @@ main(int argc, char *argv[])
 	sysmng_initialize();
 	taskmng_initialize();
 
-	joy_init();
 	pccore_init();
 	S98_init();
 
@@ -326,9 +325,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;
@@ -350,13 +351,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();