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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2020-12-01 18:18:52 +01:00
parent c6c04a82d8 cce86f453c
commit 9dd0215fed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/KeyMap.cxx
View File

@ -58,8 +58,8 @@ namespace {
int deserializeModkeyMask(json serializedMask) int deserializeModkeyMask(json serializedMask)
{ {
if (serializedMask.is_null()) return StellaMod::KBDM_NONE; if(serializedMask.is_null()) return StellaMod::KBDM_NONE;
if (!serializedMask.is_array()) return serializedMask.get<StellaMod>(); if(!serializedMask.is_array()) return serializedMask.get<StellaMod>();
int mask = 0; int mask = 0;
for(const json& mod: serializedMask) mask |= mod.get<StellaMod>(); for(const json& mod: serializedMask) mask |= mod.get<StellaMod>();