summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2010-12-29 06:10:59 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2010-12-29 06:10:59 (GMT)
commite866f1c24c6726a3d54120b584cd0ddbb725602f (patch)
tree56e48ba609eedd6b1908c0e05acc5c96075754ec
parent472978fc4d1550376b27bcd9d69ae4a78abadd87 (diff)
Exit Watch Recordings if user aborts the initial Rec Group popup.
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. Fixes #9210.
-rw-r--r--mythtv/programs/mythfrontend/playbackbox.cpp9
-rw-r--r--mythtv/programs/mythfrontend/playbackbox.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp
index 89eec85..1de8b5e 100644
--- a/mythtv/programs/mythfrontend/playbackbox.cpp
+++ b/mythtv/programs/mythfrontend/playbackbox.cpp
@@ -4345,12 +4345,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;
diff --git a/mythtv/programs/mythfrontend/playbackbox.h b/mythtv/programs/mythfrontend/playbackbox.h
index 16ee2b3..5f5c867 100644
--- a/mythtv/programs/mythfrontend/playbackbox.h
+++ b/mythtv/programs/mythfrontend/playbackbox.h
@@ -134,6 +134,7 @@ class PlaybackBox : public ScheduleCommon
public slots:
void displayRecGroup(const QString &newRecGroup = "");
+ void groupSelectorClosed(void);
protected slots:
void updateRecList(MythUIButtonListItem *);