summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2010-12-29 06:20:57 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2010-12-29 06:20:57 (GMT)
commitf36a849e83a854b3597a4a25a88aa0cbb5fd9179 (patch)
tree8510d57ea1bc273158bd7c30794911c9d0009e33
parent3cf32e89b6cad9f915bda1820ecc0b94fd6f0cdb (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. Refs #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 2bebd94..9e9b95f 100644
--- a/mythtv/programs/mythfrontend/playbackbox.cpp
+++ b/mythtv/programs/mythfrontend/playbackbox.cpp
@@ -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;
diff --git a/mythtv/programs/mythfrontend/playbackbox.h b/mythtv/programs/mythfrontend/playbackbox.h
index e930c5c..8ad45cd 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 *);