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.
This commit is contained in:
Maxime Coste 2016-10-06 23:35:32 +01:00
parent 5dd47e9c33
commit 006be63a32

View File

@ -606,6 +606,7 @@ int run_server(StringView session, StringView init_command,
String selections = selection_list_to_string(local_client->context().selections()); String selections = selection_list_to_string(local_client->context().selections());
ClientManager::instance().remove_client(*local_client, true); ClientManager::instance().remove_client(*local_client, true);
client_manager.clear_client_trash();
convert_to_client_pending = false; convert_to_client_pending = false;
if (fork_server_to_background()) if (fork_server_to_background())