mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-10-02 13:56:25 +02:00
parent 08dc0d7561 2f39081708
commit 7ad4a0e6cc
38 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/timerlist.cpp
View File

@@ -740,7 +740,7 @@ bool CTimerList::RemoteBoxChanExists(t_channel_id channel_id)
r_url += string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id);
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {
@@ -797,7 +797,7 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist)
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
//printf("[remotetimer] timers:%s\n",r_url.c_str());
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {
@@ -1286,7 +1286,7 @@ void CTimerList::paintItem(int pos)
r_url += string_printf_helper(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer.channel_id);
r_url = httpTool.downloadString(r_url, -1, httpConnectTimeout);
string errMsg = "";
std::string errMsg = "";
Json::Value root;
bool ok = parseJsonFromString(r_url, &root, &errMsg);
if (!ok) {