diff --git a/mythtv/programs/mythfrontend/guidegrid.cpp b/mythtv/programs/mythfrontend/guidegrid.cpp
index 870975e..de379c7 100644
a
|
b
|
void GuideGrid::generateListings() |
1623 | 1623 | |
1624 | 1624 | void GuideGrid::ChannelGroupMenu(int mode) |
1625 | 1625 | { |
1626 | | if (m_changrplist.empty()) |
| 1626 | ChannelGroupList channels = ChannelGroup::GetChannelGroups(mode == 0); |
| 1627 | |
| 1628 | if (channels.empty()) |
1627 | 1629 | { |
1628 | 1630 | QString message = tr("You don't have any channel groups defined"); |
1629 | 1631 | |
… |
… |
void GuideGrid::ChannelGroupMenu(int mode) |
1650 | 1652 | { |
1651 | 1653 | // add channel to group menu |
1652 | 1654 | menuPopup->SetReturnEvent(this, "channelgrouptogglemenu"); |
1653 | | ChannelGroupList channels = ChannelGroup::GetChannelGroups(true); |
1654 | | for (uint i = 0; i < channels.size(); ++i) |
1655 | | menuPopup->AddButton(channels[i].name); |
1656 | 1655 | } |
1657 | 1656 | else |
1658 | 1657 | { |
1659 | 1658 | // switch to channel group menu |
1660 | 1659 | menuPopup->SetReturnEvent(this, "channelgroupmenu"); |
1661 | 1660 | menuPopup->AddButton(QObject::tr("All Channels")); |
1662 | | for (uint i = 0; i < m_changrplist.size(); ++i) |
1663 | | menuPopup->AddButton(m_changrplist[i].name); |
1664 | 1661 | } |
1665 | 1662 | |
| 1663 | for (uint i = 0; i < channels.size(); ++i) |
| 1664 | menuPopup->AddButton(channels[i].name); |
| 1665 | |
1666 | 1666 | menuPopup->AddButton(tr("Cancel")); |
1667 | 1667 | |
1668 | 1668 | popupStack->AddScreen(menuPopup); |
… |
… |
void GuideGrid::toggleChannelFavorite(int grpid) |
1704 | 1704 | // Only allow delete if viewing the favorite group in question |
1705 | 1705 | ChannelGroup::ToggleChannel(chanid, grpid, true); |
1706 | 1706 | |
| 1707 | //regenerate the list of non empty group in case it did change |
| 1708 | m_changrplist = ChannelGroup::GetChannelGroups(false); |
| 1709 | |
1707 | 1710 | // If viewing favorites, refresh because a channel was removed |
1708 | 1711 | if (m_changrpid != -1) |
1709 | 1712 | { |