Defer deletion of unsetted option to return to main loop

Fixes #2572
mawww · Jan 20, 2019 · ae69759 · ae69759
1 parent ca105f8
commit ae69759
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -759,6 +759,7 @@ int run_server(StringView session, StringView server_init,
             client_manager.clear_client_trash();
             client_manager.clear_window_trash();
             buffer_manager.clear_buffer_trash();
+            global_scope.option_registry().clear_option_trash();
 
             if (local_client and not contains(client_manager, local_client))
                 local_client = nullptr;

diff --git a/src/option_manager.cc b/src/option_manager.cc
@@ -2,6 +2,7 @@
 
 #include "assert.hh"
 #include "flags.hh"
+#include "scope.hh"
 
 namespace Kakoune
 {
@@ -85,6 +86,7 @@ void OptionManager::unset_option(StringView name)
     {
         auto& parent_option = (*m_parent)[name];
         const bool changed = not parent_option.has_same_value(*it->value);
+        GlobalScope::instance().option_registry().move_to_trash(std::move(it->value));
         m_options.erase(name);
         if (changed)
             on_option_changed(parent_option);

diff --git a/src/option_manager.hh b/src/option_manager.hh
@@ -263,9 +263,13 @@ public:
     bool option_exists(StringView name) const { return option_desc(name) != nullptr; }
 
     CandidateList complete_option_name(StringView prefix, ByteCount cursor_pos) const;
+
+    void clear_option_trash() { m_option_trash.clear(); }
+    void move_to_trash(std::unique_ptr<Option>&& option) { m_option_trash.push_back(std::move(option)); }
 private:
     OptionManager& m_global_manager;
     Vector<std::unique_ptr<const OptionDesc>, MemoryDomain::Options> m_descs;
+    Vector<std::unique_ptr<Option>> m_option_trash;
 };
 
 }