xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak BufferManager::delete_buffer implementation

Browse Source
This commit is contained in:
Maxime Coste 2015-09-08 13:10:22 +01:00
parent fede8da14b
commit 182cc368a0
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/buffer_manager.cc
View File

@ -58,19 +58,15 @@ void BufferManager::unregister_buffer(Buffer& buffer)
void BufferManager::delete_buffer(Buffer& buffer)
{
for (auto it = m_buffers.begin(); it != m_buffers.end(); ++it)
{
if (it->get() == &buffer)
{
if (ClientManager::has_instance())
ClientManager::instance().ensure_no_client_uses_buffer(buffer);
auto it = find_if(m_buffers, [&](const SafePtr<Buffer>& p)
{ return p.get() == &buffer; });
kak_assert(it != m_buffers.end());
m_buffers.erase(it);
m_buffer_trash.emplace_back(&buffer);
return;
}
}
kak_assert(false);
if (ClientManager::has_instance())
ClientManager::instance().ensure_no_client_uses_buffer(buffer);
m_buffers.erase(it);
m_buffer_trash.emplace_back(&buffer);
}
Buffer* BufferManager::get_buffer_ifp(StringView name)