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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
M. Liebmann
2017-09-19 23:21:21 +02:00
parent ef0154a89b 25ae929523
commit 600d215aaf
8 changed files with 122 additions and 34 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>
@@ -842,12 +843,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;