From e4637f55fbd4671089b6700fdd17c3110587436f Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 14 Apr 2013 20:10:49 +0200 Subject: [PATCH] Do not start the servers until all the deserialized clients have been put back. Fixes an assert failure on load, and makes for faster loads. --- main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 95a72b8..64cab64 100644 --- a/main.cpp +++ b/main.cpp @@ -303,8 +303,6 @@ start: // Find all streams in the configuration file, and create them. create_streams(config, deserialized_stream_ids, &deserialized_inputs); - servers->run(); - vector acceptors = create_acceptors(config, &deserialized_acceptors); vector inputs = create_inputs(config, &deserialized_inputs); @@ -317,6 +315,8 @@ start: for (int i = 0; i < loaded_state.clients_size(); ++i) { servers->add_client_from_serialized(loaded_state.clients(i)); } + + servers->run(); // Start writing statistics. StatsThread *stats_thread = NULL; -- 2.39.2