From 22a6da1604a6493c6b1fb396dc75b38a18bd50d6 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 4 Jan 2016 18:59:24 +0100 Subject: [PATCH] Fixed #146. --- src/gui/feedmessageviewer.cpp | 2 +- src/gui/feedsview.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 424c2e721..dc8533d94 100755 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -213,7 +213,7 @@ void FeedMessageViewer::updateFeedButtonsAvailability() { form_main->m_ui->m_actionServiceDelete->setEnabled(service_selected); form_main->m_ui->m_actionServiceEdit->setEnabled(service_selected); - form_main->m_ui->m_actionAddFeedIntoSelectedAccount->setEnabled(service_selected); + form_main->m_ui->m_actionAddFeedIntoSelectedAccount->setEnabled(anything_selected); form_main->m_ui->m_menuAddItem->setEnabled(!critical_action_running); form_main->m_ui->m_menuAccounts->setEnabled(!critical_action_running); diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 18f4e0dca..a523b6099 100755 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -137,8 +137,8 @@ void FeedsView::loadExpandedStates() { void FeedsView::addFeedIntoSelectedAccount() { RootItem *selected = selectedItem(); - if (selected->kind() == RootItemKind::ServiceRoot) { - ServiceRoot *root = selected->toServiceRoot(); + if (selected != NULL) { + ServiceRoot *root = selected->getParentServiceRoot(); if (root->supportsFeedAddingByUrl()) { root->addFeedByUrl();