diff options
author | 2020-06-21 17:34:44 +1000 | |
---|---|---|
committer | 2020-06-21 17:34:44 +1000 | |
commit | feda349b3eea19d4fd0010a74e2dd6ff30f26b16 (patch) | |
tree | 2ba4b13a2ca181515354170a12b81446ee53da21 /src/emu/natkeyboard.cpp | |
parent | 3c499849dd96f17d7944619248261480017ba0c3 (diff) | |
parent | 01661be41c37560a37f2b43c5ecee7a10a6a1680 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/emu/natkeyboard.cpp')
-rw-r--r-- | src/emu/natkeyboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/natkeyboard.cpp b/src/emu/natkeyboard.cpp index ce7391c67cd..f264754b3a4 100644 --- a/src/emu/natkeyboard.cpp +++ b/src/emu/natkeyboard.cpp @@ -658,7 +658,7 @@ void natural_keyboard::build_codes(ioport_manager &manager) } newcode.field[fieldnum] = &field; - if (m_keycode_map.end() == found) + if (m_keycode_map.end() == found) { keycode_map_list map_list; map_list.emplace_back(newcode); @@ -882,7 +882,7 @@ const natural_keyboard::keycode_map_entry *natural_keyboard::find_code(char32_t keycode_map::const_iterator const found(m_keycode_map.find(ch)); if (m_keycode_map.end() == found) return nullptr; for(const keycode_map_entry &entry : found->second) - { + { if (entry.condition.eval()) return &entry; } @@ -912,7 +912,7 @@ void natural_keyboard::dump(std::ostream &str) const { // identify the keys used for (std::size_t field = 0; (entry.field.size() > field) && entry.field[field]; ++field) - util::stream_format(str, "%s'%s'", first ? "" : ", ", entry.field[field]->name()); + util::stream_format(str, "%s'%s'", first ? "" : ", ", entry.field[field]->name()); // carriage return str << '\n'; |