From 28bcb45b925427da1fb3204eac332fc43d74365e Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Mon, 22 May 2017 16:56:06 +0100
Subject: Fix bug where idle timers of disabled modes were still run

---
 src/context.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/context.cc')

diff --git a/src/context.cc b/src/context.cc
index 09d1d4d5..3963254d 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -148,10 +148,6 @@ void Context::change_buffer(Buffer& buffer)
     if (m_edition_level > 0)
        this->buffer().commit_undo_group();
 
-
-    if (has_input_handler())
-        input_handler().reset_normal_mode();
-
     m_window.reset();
     if (has_client())
     {
@@ -161,6 +157,9 @@ void Context::change_buffer(Buffer& buffer)
     }
     else
         m_selections = SelectionList{buffer, Selection{}};
+
+    if (has_input_handler())
+        input_handler().reset_normal_mode();
 }
 
 SelectionList& Context::selections()
-- 
cgit v1.2.3