mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-21 10:33:00 +02:00
parent 89d636b189 dd377dff8f
commit 3aa6bf25d9
32 changed files with 376 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/movieplayer.cpp
View File

@@ -60,6 +60,7 @@
#include <driver/fontrenderer.h>
#include <eitd/edvbstring.h>
#include <system/helpers.h>
#include <system/helpers-json.h>
#include <src/mymenu.h>
@@ -863,12 +864,12 @@ bool CMoviePlayerGui::luaGetUrl(const std::string &script, const std::string &fi
return false;
}
string errMsg = "";
Json::Value root;
Json::Reader reader;
bool parsedSuccess = reader.parse(result_string, root, false);
if (!parsedSuccess) {
bool ok = parseJsonFromString(result_string, &root, &errMsg);
if (!ok) {
printf("Failed to parse JSON\n");
printf("%s\n", reader.getFormattedErrorMessages().c_str());
printf("%s\n", errMsg.c_str());
if (box != NULL) {
box->hide();
delete box;