From 006be63a327ded416aa26f470af89e741d2cf651 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Thu, 6 Oct 2016 23:35:32 +0100
Subject: Ensure local client is destroyed before we fork the server to
 background

The recent change that introduced defered client deletion made the local
client destruction happens too late, putting the terminal in a bad state
when we resumed the process as client only.
---
 src/main.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/main.cc b/src/main.cc
index 3faf79f7..d6fdb4e8 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -606,6 +606,7 @@ int run_server(StringView session, StringView init_command,
                 String selections = selection_list_to_string(local_client->context().selections());
 
                 ClientManager::instance().remove_client(*local_client, true);
+                client_manager.clear_client_trash();
                 convert_to_client_pending = false;
 
                 if (fork_server_to_background())
-- 
cgit v1.2.3