From 8b76b9692cdf7305754e28a9cfcaf6782582fe08 Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 24 May 2016 16:43:16 +0200 Subject: [PATCH 1/1] Fixed bug where non empty CALL responses where lost with an error. --- protocol/amcp/AMCPCommandsImpl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index 7022a7bf9..d4f311f5a 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -536,7 +536,7 @@ void call_describer(core::help_sink& sink, const core::help_repository& repo) std::wstring call_command(command_context& ctx) { - auto result = ctx.channel.channel->stage().call(ctx.layer_index(), ctx.parameters); + auto result = ctx.channel.channel->stage().call(ctx.layer_index(), ctx.parameters).get(); // TODO: because of std::async deferred timed waiting does not work @@ -545,10 +545,10 @@ std::wstring call_command(command_context& ctx) CASPAR_THROW_EXCEPTION(timed_out());*/ std::wstringstream replyString; - if (result.get().empty()) + if (result.empty()) replyString << L"202 CALL OK\r\n"; else - replyString << L"201 CALL OK\r\n" << result.get() << L"\r\n"; + replyString << L"201 CALL OK\r\n" << result << L"\r\n"; return replyString.str(); } -- 2.39.2