From 4c2f60350a355cf50c58ad7fd7a9c467e3aebbc7 Mon Sep 17 00:00:00 2001
From: Don Gagne <Don@laptop-3.local>
Date: Thu, 20 Apr 2017 17:14:18 -0700
Subject: [PATCH] Fix error handling

---
 src/JsonHelper.cc | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/JsonHelper.cc b/src/JsonHelper.cc
index fcea9a534d..e6ee750e0f 100644
--- a/src/JsonHelper.cc
+++ b/src/JsonHelper.cc
@@ -127,19 +127,16 @@ bool JsonHelper::parseEnum(const QJsonObject& jsonObject, QStringList& enumStrin
 
 bool JsonHelper::isJsonFile(const QByteArray& bytes, QJsonDocument& jsonDoc, QString& errorString)
 {
-    QJsonParseError error;
+    QJsonParseError parseError;
 
-    jsonDoc = QJsonDocument::fromJson(bytes, &error);
+    jsonDoc = QJsonDocument::fromJson(bytes, &parseError);
 
-    if (error.error == QJsonParseError::NoError) {
+    if (parseError.error == QJsonParseError::NoError) {
         return true;
-    }
-
-    if (error.error == QJsonParseError::MissingObject && error.offset == 0) {
+    } else {
+        errorString = parseError.errorString();
         return false;
     }
-
-    return true;
 }
 
 bool JsonHelper::validateQGCJsonFile(const QJsonObject& jsonObject,
-- 
GitLab