diff options
| author | in0ni <gonzalez.af@gmail.com> | 2022-05-03 22:15:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 22:15:42 -0400 |
| commit | 0cf5105df1a2c6f36e3e8af234b230f2dd5d0710 (patch) | |
| tree | 96d42a80d948004b7caf72411fffebaf421e979f /src/input_handler.cc | |
| parent | 9b49c5db0df7de76f299b40f2c70076ced89e64c (diff) | |
| parent | 5c6238ef113da8c2844ff9bcfa27c87e3473c150 (diff) | |
Merge branch 'mawww:master' into master
Diffstat (limited to 'src/input_handler.cc')
| -rw-r--r-- | src/input_handler.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 8adbbcee..9b1857a8 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -1694,18 +1694,11 @@ InputHandler::ScopedForceNormal::~ScopedForceNormal() if (not m_mode) return; - kak_assert(m_handler.m_mode_stack.size() > 1); - if (m_mode == m_handler.m_mode_stack.back().get()) m_handler.pop_mode(m_mode); - else - { - auto it = find_if(m_handler.m_mode_stack, - [this](const RefPtr<InputMode>& m) - { return m.get() == m_mode; }); - kak_assert(it != m_handler.m_mode_stack.end()); + else if (auto it = find(m_handler.m_mode_stack, m_mode); + it != m_handler.m_mode_stack.end()) m_handler.m_mode_stack.erase(it); - } } static bool is_valid(Key key) |