1 files changed, 7 insertions, 1 deletions
diff --git a/src/remote.cc b/src/remote.cc
index ecd7da1c..ee7d7602 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -541,10 +541,16 @@ Server::Server(String session_name)
     m_listener.reset(new FDWatcher{listen_sock, accepter});
 }
 
-Server::~Server()
+void Server::close_session()
 {
     unlink(("/tmp/kak-" + m_session).c_str());
     close(m_listener->fd());
+    m_listener.reset();
+}
+
+Server::~Server()
+{
+    close_session();
 }
 
 }