From 3abece6f0a7edca476ee0c493f30dda8f8bcefd5 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Fri, 30 Nov 2018 16:52:54 +0100
Subject: core: stop ownership circles in connection

---
 src/control_connection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/control_connection.cpp')

diff --git a/src/control_connection.cpp b/src/control_connection.cpp
index 586b5de..c06d489 100644
--- a/src/control_connection.cpp
+++ b/src/control_connection.cpp
@@ -17,13 +17,13 @@ control_connection::control_connection(control_connection::key key, control_conn
 {
 }
 
-bool control_connection::add(std::shared_ptr<control_connection::listener> listener)
+bool control_connection::add(listener * listener)
 {
     auto [_, inserted] = m_listeners.insert(listener);
     return inserted;
 }
 
-bool control_connection::remove(std::shared_ptr<control_connection::listener> listener)
+bool control_connection::remove(listener * listener)
 {
     return m_listeners.erase(listener);
 }
@@ -92,9 +92,9 @@ void control_connection::perform_read()
         {
             auto msg = message{};
             m_input >> msg;
-            m_input.ignore(std::numeric_limits<std::streamsize>::max());
             if (!m_input)
             {
+                m_input.ignore(std::numeric_limits<std::streamsize>::max());
                 m_input.clear();
             }
             else
-- 
cgit v1.2.3