From 5179ad190827a75ee096f2cc92d3f0d8837eff72 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 20 Apr 2013 14:12:41 +0200 Subject: [PATCH] Revert "Fix a bug where Metacube streams would become inconsistent between different servers, since the first one did not get the right encoding set." Doesn't actually fix the issue. This reverts commit 5605c88a27fcf64ea8f6fd6cbb52dada73856ee0. --- main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 0aa91f3..c89ec72 100644 --- a/main.cpp +++ b/main.cpp @@ -153,9 +153,9 @@ void create_streams(const Config &config, Stream::Encoding(stream_config.encoding)); } else { servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size); + servers->set_encoding(stream_config.stream_id, + Stream::Encoding(stream_config.encoding)); } - servers->set_encoding(stream_config.stream_id, - Stream::Encoding(stream_config.encoding)); expecting_stream_ids.erase(stream_config.stream_id); if (stream_config.mark_pool != -1) { -- 2.39.2