From bf20e185e636b5da785f16dd980f711a06b98077 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 22 Feb 2016 23:24:07 +0100 Subject: [PATCH] control/epgsearch: fix old plain text output Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f9ac2b32cd13abd86071c3c61a00260e4b9b28ba Author: vanhofen Date: 2016-02-22 (Mon, 22 Feb 2016) Origin message was: ------------------ - control/epgsearch: fix old plain text output ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index df348214b..607fdafa1 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -1452,7 +1452,7 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format) CChannelEventList evtlist; bool search_epginfo = (hh->ParamList["epginfo"] != "false"); - bool return_epginfo = (hh->ParamList["epginfo"] == "true"); + bool return_epginfo = (hh->ParamList["epginfo"] == "true" || hh->ParamList["epginfo"].empty()); std::string search_keyword = (hh->ParamList["search"].empty()) ? hh->ParamList["1"] : hh->ParamList["search"]; const int search_epg_item = search_epginfo ? 5 /*SEARCH_EPG_ALL*/ : 1 /*SEARCH_EPG_TITLE*/; @@ -1593,10 +1593,12 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format) #endif } hh->WriteLn("----------------------------------------------------------"); - return; } } } + if (hh->outType == plain) + return; + result = hh->outArray("epgsearch", result); hh->SendResult(result);