diff --git a/saoriview.cpp b/saoriview.cpp index 98bbce6..5c9002e 100644 --- a/saoriview.cpp +++ b/saoriview.cpp @@ -247,7 +247,6 @@ QString::number(json["favourites_count"].toInt()) ); } - return result; } @@ -432,8 +431,12 @@ m_entries.insert(i,entry); qobject_cast(ui->scrollAreaWidgetContents->layout())->insertWidget(i,entry); if (m_viewname == "notifications") entry->setContent(notificationParser(j.toObject())); - else entry->setContent(statusParser(j.toObject()), - !j.toObject()["spoiler_text"].toString().isEmpty()); + else { + bool cw = !j.toObject()["spoiler_text"].toString().isEmpty(); + if (!j.toObject()["reblog"].isNull()) + cw = !j.toObject()["reblog"].toObject()["spoiler_text"].toString().isEmpty(); + entry->setContent(statusParser(j.toObject()),cw); + } } } if (m_entries.count()) {