BufferManager notify the ClientManager when a buffer dies

src/buffer_manager.cc

@@ -4,6 +4,7 @@
 #include "buffer.hh"
 #include "exception.hh"
 #include "string.hh"
+#include "client_manager.hh"
 
 namespace Kakoune
 {
@@ -35,6 +36,8 @@ void BufferManager::unregister_buffer(Buffer& buffer)
     {
         if (*it == &buffer)
         {
+            if (ClientManager::has_instance())
+                ClientManager::instance().ensure_no_client_uses_buffer(buffer);
             m_buffers.erase(it);
             return;
         }

src/commands.cc

@@ -234,7 +234,6 @@ void delete_buffer(const CommandParameters& params, Context& context)
     if (manager.count() == 1)
         throw runtime_error("buffer " + buffer.name() + " is the last one");
 
-    ClientManager::instance().ensure_no_client_uses_buffer(buffer);
     delete &buffer;
 }
 

src/utils.hh

@@ -33,6 +33,11 @@ public:
         ms_instance = nullptr;
     }
 
+    static bool has_instance()
+    {
+        return ms_instance != nullptr;
+    }
+
 protected:
     Singleton()
     {