ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Fix bug where the menu hotkeys for File > Load State Slot and File > Save State Slot weren't being passed to the event manager.
This commit is contained in:
rogerman 2013-03-13 23:02:27 +00:00
parent 12dc048a63
commit 98ed8e83e6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desmume/src/cocoa/userinterface/InputManager.mm
View File

@ -1198,6 +1198,10 @@ static std::tr1::unordered_map<unsigned short, std::string> keyboardNameTable; /
// Look up the command attributes using the input key.
const std::string inputKey = std::string(inputAttr.deviceCode) + ":" + std::string(inputAttr.elementCode);
CommandAttributes cmdAttr = commandMap[inputKey];
if (cmdAttr.tag[0] == '\0' || cmdAttr.selector == nil)
{
continue;
}
cmdAttr.input = inputAttr; // Copy the input state to the command attributes.
cmdList.push_back(cmdAttr); // Add the command attributes to the list.
@ -1234,6 +1238,10 @@ static std::tr1::unordered_map<unsigned short, std::string> keyboardNameTable; /
// Look up the command key using the input key.
const std::string inputKey = std::string(inputAttr->deviceCode) + ":" + std::string(inputAttr->elementCode);
CommandAttributes cmdAttr = commandMap[inputKey];
if (cmdAttr.tag[0] == '\0' || cmdAttr.selector == nil)
{
return didCommandDispatch;
}
// Copy the input state to the command attributes.
cmdAttr.input = *inputAttr;