Merge pull request #189 from r0kk3rz/master

fix error handling in loadState()

1 files changed, 8 insertions, 5 deletions

diff --git a/connection.cpp b/connection.cpp
index 7ba11145..b3f1ceb8 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -719,15 +719,18 @@ void Connection::loadState(const QUrl &fromFile)
         qCDebug(MAIN) << "No state cache file found";
         return;
     }
-    file.open(QFile::ReadOnly);
+    if(!file.open(QFile::ReadOnly))
+    {
+        qCWarning(MAIN) << "file " << file.fileName() << "failed to open for read";
+        return;
+    }
     QByteArray data = file.readAll();
 
-    QJsonParseError e;
     auto jsonDoc = d->cacheToBinary ? QJsonDocument::fromBinaryData(data) :
-                                      QJsonDocument::fromJson(data, &e);
-    if (e.error != QJsonParseError::NoError)
+                                      QJsonDocument::fromJson(data);
+    if (jsonDoc.isNull())
     {
-        qCWarning(MAIN) << "Cache file not found or broken, discarding";
+        qCWarning(MAIN) << "Cache file broken, discarding";
         return;
     }
     auto actualCacheVersionMajor =