summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/jsondb-client/client.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/jsondb-client/client.cpp b/tools/jsondb-client/client.cpp
index ccb9d43a..60103b15 100644
--- a/tools/jsondb-client/client.cpp
+++ b/tools/jsondb-client/client.cpp
@@ -671,9 +671,16 @@ void Client::loadJsonFile(const QString &jsonFile)
}
json.open(QFile::ReadOnly);
- QJsonDocument doc = QJsonDocument::fromJson(json.readAll());
+ QJsonParseError error;
+ QJsonDocument doc = QJsonDocument::fromJson(json.readAll(), &error);
json.close();
+ if (error.error != QJsonParseError::NoError) {
+ qDebug() << "Unable to parse file:" << error.errorString();
+ fileLoadError();
+ return;
+ }
+
QList<QJsonObject> objects;
if (doc.isArray()) {
QJsonArray objectArray = doc.array();
@@ -691,6 +698,8 @@ void Client::loadJsonFile(const QString &jsonFile)
connect(write, SIGNAL(finished()), this, SLOT(fileLoadSuccess()));
connect(write, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)),
this, SLOT(fileLoadError()));
+ connect(write, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)),
+ this, SLOT(onRequestError(QtJsonDb::QJsonDbRequest::ErrorCode,QString)));
mConnection->send(write);
}