diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 00238c386..fe6b6b9a9 100755 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -1,6 +1,13 @@ 3.0.1 ————— +Fixed: + +▪ Fixed problem with importing invalid OPML 2.0 files. (bug #145) + +3.0.1 +————— + Added: ▪ Background color of notifications is now changeable. (issue #134) diff --git a/src/services/standard/standardfeedsimportexportmodel.cpp b/src/services/standard/standardfeedsimportexportmodel.cpp index 7a7f1a156..f5e071e7c 100755 --- a/src/services/standard/standardfeedsimportexportmodel.cpp +++ b/src/services/standard/standardfeedsimportexportmodel.cpp @@ -57,8 +57,8 @@ RootItem *FeedsImportExportModel::rootItem() const { return m_rootItem; } -void FeedsImportExportModel::setRootItem(RootItem *rootItem) { - m_rootItem = rootItem; +void FeedsImportExportModel::setRootItem(RootItem *root_item) { + m_rootItem = root_item; } bool FeedsImportExportModel::exportToOMPL20(QByteArray &result) { @@ -264,17 +264,21 @@ void FeedsImportExportModel::setMode(const FeedsImportExportModel::Mode &mode) { } void FeedsImportExportModel::checkAllItems() { - foreach (RootItem *root_child, m_rootItem->childItems()) { - if (root_child->kind() != RootItemKind::Bin) { - setData(indexForItem(root_child), Qt::Checked, Qt::CheckStateRole); + if (m_rootItem != NULL) { + foreach (RootItem *root_child, m_rootItem->childItems()) { + if (root_child->kind() != RootItemKind::Bin) { + setData(indexForItem(root_child), Qt::Checked, Qt::CheckStateRole); + } } } } void FeedsImportExportModel::uncheckAllItems() { - foreach (RootItem *root_child, m_rootItem->childItems()) { - if (root_child->kind() != RootItemKind::Bin) { - setData(indexForItem(root_child), Qt::Unchecked, Qt::CheckStateRole); + if (m_rootItem != NULL) { + foreach (RootItem *root_child, m_rootItem->childItems()) { + if (root_child->kind() != RootItemKind::Bin) { + setData(indexForItem(root_child), Qt::Unchecked, Qt::CheckStateRole); + } } } } diff --git a/src/services/standard/standardfeedsimportexportmodel.h b/src/services/standard/standardfeedsimportexportmodel.h index 3fc5aa9c3..0a313f7c1 100755 --- a/src/services/standard/standardfeedsimportexportmodel.h +++ b/src/services/standard/standardfeedsimportexportmodel.h @@ -55,7 +55,7 @@ class FeedsImportExportModel : public QAbstractItemModel { // Root item manipulators. RootItem *rootItem() const; - void setRootItem(RootItem *rootItem); + void setRootItem(RootItem *root_item); // Exports to OPML 2.0 // NOTE: http://dev.opml.org/spec2.html