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