Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit

src/nhttpd/tuxboxapi/neutrinoyparser.cpp

@@ -1035,6 +1035,10 @@ std::string  CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
 	unsigned timerId=0;
 	std::string cmd, stimerid;
 	CTimerd::responseGetTimer timer;             // Timer
+	timer.alarmTime = 0;
+	timer.stopTime = 0;
+	timer.apids = 0;
+	timer.eventType = CTimerd::__TIMER_NEXTPROGRAM;//nothing
 	time_t now_t = time(NULL);
 	ySplitString(para, " ", cmd, stimerid);
 	if(cmd != "new")