From 911f333a7f37a4d08e43ded4aad1bf651964e70f Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Wed, 24 Feb 2016 16:42:21 +0100
Subject: [PATCH] - controlapi/epg: add fallback when no channel or bouquet is
 given

This function needs a fix, because "bouquetnr=all" breakes json output.
---
 src/nhttpd/tuxboxapi/controlapi.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index 92dd1069a..c9a9ce714 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -1527,6 +1527,7 @@ void CControlAPI::epgDetailList(CyhookHandler *hh) {
 	else if (!(hh->ParamList["channelname"].empty())) {
 		channel_id = NeutrinoAPI->ChannelNameToChannelId(hh->ParamList["channelname"].c_str());
 	}
+
 	// or determine bouquetnr -> iterate the bouquet
 	int bouquetnr = -1;
 	bool all_bouquets = false;
@@ -1538,6 +1539,13 @@ void CControlAPI::epgDetailList(CyhookHandler *hh) {
 		bouquetnr--;
 	}
 
+	// fallback
+	if ((channel_id == (t_channel_id) -1) && (bouquetnr == -1))
+	{
+		channel_id = CZapit::getInstance()->GetCurrentChannelID();
+		//all_bouquets = true; //better, but broken
+	}
+
 	// ------ generate output ------
 	hh->outStart(true /*old mode*/);
 	std::string result = "";