--- np2/macos9/np2.cpp	2003/11/13 20:14:31	1.15
+++ np2/macos9/np2.cpp	2003/11/15 07:10:02	1.17
@@ -277,54 +277,61 @@ static void HandleMenuChoice(long wParam
 		case IDM_KEY:
 			menu_setkey(0);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_JOY1:
 			menu_setkey(1);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_JOY2:
 			menu_setkey(2);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_MOUSEKEY:
 			menu_setkey(3);
 			keystat_resetjoykey();
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XSHIFT:
 			menu_setxshift(np2cfg.XSHIFT ^ 1);
 			keystat_forcerelease(0x70);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XCTRL:
 			menu_setxshift(np2cfg.XSHIFT ^ 2);
 			keystat_forcerelease(0x74);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_XGRPH:
 			menu_setxshift(np2cfg.XSHIFT ^ 4);
 			keystat_forcerelease(0x73);
+			update |= SYS_UPDATECFG;
 			break;
 
 		case IDM_F12MOUSE:
 			menu_setf12copy(0);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12COPY:
 			menu_setf12copy(1);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_F12STOP:
 			menu_setf12copy(2);
 			keystat_resetcopyhelp();
-			update |= SYS_UPDATECFG;
+			update |= SYS_UPDATEOSCFG;
 			break;
 
 		case IDM_BEEPOFF:
@@ -727,8 +734,6 @@ int main(int argc, char *argv[]) {
 		flagload(np2resume);
 	}
 
-	SetScriptManagerVariable(smKeyDisableState, 1);
-
 	SetEventMask(everyEvent);
 
 	np2running = TRUE;