--- np2/macos9/np2.cpp	2003/12/04 16:48:15	1.19
+++ np2/macos9/np2.cpp	2003/12/05 14:13:01	1.21
@@ -123,7 +123,7 @@ static void MenuBarInit(void) {
 	SetItemCmd(hmenu, LoWord(IDM_FDD2EJECT), 'E');
 	SetMenuItemModifiers(hmenu, LoWord(IDM_FDD2EJECT), kMenuOptionModifier);
 	hmenu = GetMenuHandle(IDM_SASI2);
-	SetItemCmd(hmenu, LoWord(IDM_FDD2OPEN), 'O');
+	SetItemCmd(hmenu, LoWord(IDM_SASI2OPEN), 'O');
 	SetMenuItemModifiers(hmenu, LoWord(IDM_SASI2OPEN), kMenuOptionModifier);
 #else
 	EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE));
@@ -572,15 +572,24 @@ static void eventproc(EventRecord *event
 				break;
 			}
 #if !TARGET_API_MAC_CARBON
-			if ((keycode == 0x6f) && (np2oscfg.F12COPY == 0)) {
+			if ((keycode == 0x6f) && (np2oscfg.F12KEY == 0)) {
 				HandleMenuChoice(IDM_MOUSE);
 				break;
 			}
 #endif
 			if (event->modifiers & cmdKey) {
+#if !TARGET_API_MAC_CARBON
+				if (mackbd_keydown(keycode, TRUE)) {
+					break;
+				}
+#endif
 				soundmng_stop();
 				mousemng_disable(MOUSEPROC_MACUI);
+#if TARGET_API_MAC_CARBON
+				HandleMenuChoice(MenuEvent(event));
+#else
 				HandleMenuChoice(MenuKey(event->message & charCodeMask));
+#endif
 				mousemng_enable(MOUSEPROC_MACUI);
 				soundmng_play();
 			}