From 0c41c141875dd91a12e20fa99fc7876d0ee8a792 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Wed, 26 Aug 2015 19:33:52 +0100
Subject: Reorganize slightly local client creation

---
 src/client_manager.cc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/client_manager.cc')

diff --git a/src/client_manager.cc b/src/client_manager.cc
index 922ee250..927c1c0e 100644
--- a/src/client_manager.cc
+++ b/src/client_manager.cc
@@ -66,15 +66,11 @@ void ClientManager::handle_pending_inputs() const
 
 void ClientManager::remove_client(Client& client)
 {
-    for (auto it = m_clients.begin(); it != m_clients.end(); ++it)
-    {
-        if (it->get() == &client)
-        {
-             m_clients.erase(it);
-             return;
-        }
-    }
-    kak_assert(false);
+    auto it = find_if(m_clients,
+                      [&](const std::unique_ptr<Client>& ptr)
+                      { return ptr.get() == &client; });
+    kak_assert(it != m_clients.end());
+    m_clients.erase(it);
 }
 
 WindowAndSelections ClientManager::get_free_window(Buffer& buffer)
-- 
cgit v1.2.3