From b91e4e8d4b0a16915dbdda9c27877d75f81606f3 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 22 Mar 2009 13:42:40 +0000 Subject: [PATCH] Reverted the addition of the Exit hotkey, it broke the default key mappings --- src/input.cpp | 2 +- src/input.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/input.cpp b/src/input.cpp index faad5019..4c1b6d96 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -617,7 +617,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]= { EMUCMD_FRAME_ADVANCE, EMUCMDTYPE_MISC, FCEUI_FrameAdvance, FCEUI_FrameAdvanceEnd, 0, "Frame Advance", EMUCMDFLAG_TASEDIT }, { EMUCMD_SCREENSHOT, EMUCMDTYPE_MISC, FCEUI_SaveSnapshot, 0, 0, "Screenshot", EMUCMDFLAG_TASEDIT }, { EMUCMD_HIDE_MENU_TOGGLE, EMUCMDTYPE_MISC, FCEUD_HideMenuToggle, 0, 0, "Hide Menu Toggle", EMUCMDFLAG_TASEDIT }, - { EMUCMD_EXIT, EMUCMDTYPE_MISC, DoFCEUExit, 0, 0, "Exit", 0}, + //{ EMUCMD_EXIT, EMUCMDTYPE_MISC, DoFCEUExit, 0, 0, "Exit", 0}, //adelikat: This can't be added here without throwing off the entire enum table (which causes the default mappings to be incorrect and can lead to some crashes). Sorry, needs to be added to the end of the enum or more workarounds need to be done { EMUCMD_SPEED_SLOWEST, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Slowest Speed", 0 }, { EMUCMD_SPEED_SLOWER, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Speed Down", 0 }, diff --git a/src/input.h b/src/input.h index c07a3ca4..e06898cf 100644 --- a/src/input.h +++ b/src/input.h @@ -215,7 +215,7 @@ enum EMUCMD EMUCMD_MISC_UNDOREDOSAVESTATE, EMUCMD_MAX, //For campatibility with old configuration files - EMUCMD_EXIT + //EMUCMD_EXIT //adelikat, EXIT hotkey commented out in input.cpp so commented out here too }; enum EMUCMDTYPE