Skip to content

Commit

Permalink
Exit Watch Recordings if user aborts the initial Rec Group popup.
Browse files Browse the repository at this point in the history
If the user ESCapes out of the initial Recording Group popup on
the Watch Recordings screen, exit the screen rather than leaving
the user with a blank list.  This restores pre-MythUI functionality.

Refs #9210.
  • Loading branch information
cpinkham committed Dec 29, 2010
1 parent 3cf32e8 commit f36a849
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
9 changes: 9 additions & 0 deletions mythtv/programs/mythfrontend/playbackbox.cpp
Expand Up @@ -4336,12 +4336,21 @@ void PlaybackBox::showGroupFilter(void)
{
connect(recGroupPopup, SIGNAL(result(QString)),
SLOT(displayRecGroup(QString)));
connect(recGroupPopup, SIGNAL(Exiting()),
SLOT(groupSelectorClosed()));
m_popupStack->AddScreen(recGroupPopup);
}
else
delete recGroupPopup;
}

void PlaybackBox::groupSelectorClosed(void)
{
if ((gCoreContext->GetNumSetting("QueryInitialFilter", 0) == 1) &&
((m_titleList.size() <= 1)))
Close();
}

void PlaybackBox::setGroupFilter(const QString &recGroup)
{
QString newRecGroup = recGroup;
Expand Down
1 change: 1 addition & 0 deletions mythtv/programs/mythfrontend/playbackbox.h
Expand Up @@ -134,6 +134,7 @@ class PlaybackBox : public ScheduleCommon

public slots:
void displayRecGroup(const QString &newRecGroup = "");
void groupSelectorClosed(void);

protected slots:
void updateRecList(MythUIButtonListItem *);
Expand Down

0 comments on commit f36a849

Please sign in to comment.