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

BufferManager: Support missing ClientManager

Browse Source
This commit is contained in:
Maxime Coste 2018-02-18 14:50:24 +11:00
parent 10c6c59a26
commit d9cddf41f2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/buffer_manager.cc
View File

@ -21,7 +21,8 @@ BufferManager::~BufferManager()
buffer->on_unregistered();
// Make sure not clients exists
ClientManager::instance().clear();
if (ClientManager::has_instance())
ClientManager::instance().clear();
}
Buffer* BufferManager::create_buffer(String name, Buffer::Flags flags,
@ -55,7 +56,8 @@ void BufferManager::delete_buffer(Buffer& buffer)
m_buffer_trash.emplace_back(std::move(*it));
m_buffers.erase(it);
ClientManager::instance().ensure_no_client_uses_buffer(buffer);
if (ClientManager::has_instance())
ClientManager::instance().ensure_no_client_uses_buffer(buffer);
buffer.on_unregistered();
}
@ -105,8 +107,11 @@ void BufferManager::clear_buffer_trash()
{
// Do that again, to be tolerant in some corner cases, where a buffer is
// deleted during its creation
ClientManager::instance().ensure_no_client_uses_buffer(*buffer);
ClientManager::instance().clear_window_trash();
if (ClientManager::has_instance())
{
ClientManager::instance().ensure_no_client_uses_buffer(*buffer);
ClientManager::instance().clear_window_trash();
}
buffer.reset();
}