From f74f2ca3efeb81352427fb9e0f0621143206bd3d Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 21 Sep 2021 01:36:38 +0200 Subject: [PATCH] Subsonic: Remove redundant null check --- src/subsonic/subsonicbaserequest.cpp | 2 +- src/subsonic/subsonicservice.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/subsonic/subsonicbaserequest.cpp b/src/subsonic/subsonicbaserequest.cpp index c10b05840..94d7c30d4 100644 --- a/src/subsonic/subsonicbaserequest.cpp +++ b/src/subsonic/subsonicbaserequest.cpp @@ -203,7 +203,7 @@ QJsonObject SubsonicBaseRequest::ExtractJsonObj(QByteArray &data) { return QJsonObject(); } - if (json_doc.isNull() || json_doc.isEmpty()) { + if (json_doc.isEmpty()) { Error("Received empty Json document.", data); return QJsonObject(); } diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp index 192e96c31..fa0b258ec 100644 --- a/src/subsonic/subsonicservice.cpp +++ b/src/subsonic/subsonicservice.cpp @@ -272,7 +272,7 @@ void SubsonicService::HandlePingReply(QNetworkReply *reply, const QUrl &url, con QByteArray data = reply->readAll(); QJsonParseError parse_error; QJsonDocument json_doc = QJsonDocument::fromJson(data, &parse_error); - if (parse_error.error == QJsonParseError::NoError && !json_doc.isNull() && !json_doc.isEmpty() && json_doc.isObject()) { + if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) { QJsonObject json_obj = json_doc.object(); if (!json_obj.isEmpty() && json_obj.contains("error")) { QJsonValue json_error = json_obj["error"];