From 67849f2db7df141c09f5b26205d76fea2fcbd583 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 2 Mar 2016 20:27:47 +0000 Subject: BufferManager should outlive ClientManager in the end If not, clients end up keeping references on a buffer while it it being deleted. --- src/buffer_manager.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/buffer_manager.cc') diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc index 3398be34..9568c33e 100644 --- a/src/buffer_manager.cc +++ b/src/buffer_manager.cc @@ -16,21 +16,13 @@ struct name_not_unique : runtime_error name_not_unique() : runtime_error("buffer name is already in use") {} }; -BufferManager::BufferManager() -{ - kak_assert(ClientManager::has_instance()); -} - BufferManager::~BufferManager() { - kak_assert(ClientManager::has_instance()); + kak_assert(not ClientManager::has_instance()); // delete remaining buffers while (not m_buffers.empty()) - { - ClientManager::instance().ensure_no_client_uses_buffer(*m_buffers.front().get()); delete m_buffers.front().get(); - } } void BufferManager::register_buffer(Buffer& buffer) -- cgit v1.2.3