summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2010-11-17 07:31:04 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2010-11-17 07:31:04 (GMT)
commit3eeb6bf153bfef9ee89b1206ec97e78046c7171e (patch)
tree727fe20a28a2a371f1a7402e1741c31c444cb1f0
parent369cb64eec490902202c4d4af311bd9ee789a167 (diff)
Unpause playback when clearing the Delete Recording OSD dialog (if we
paused it to show the dialog). Refs #9228 git-svn-id: http://svn.mythtv.org/svn/trunk@27254 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/libs/libmythtv/tv_play.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 404b8d5..497428c 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -9728,6 +9728,10 @@ void TV::OSDDialogEvent(int result, QString text, QString action)
else if (valid && desc[0] == "DELETE")
{
}
+ else if (valid && desc[0] == "PLAY")
+ {
+ DoPlay(actx);
+ }
else
{
VERBOSE(VB_IMPORTANT, "Unrecognised dialog event.");
@@ -11700,7 +11704,8 @@ void TV::ShowOSDPromptDeleteRecording(PlayerContext *ctx, QString title,
ClearOSD(ctx);
- if (!ctx->paused)
+ bool paused = ctx->paused;
+ if (!paused)
DoTogglePause(ctx, false);
InfoMap infoMap;
@@ -11729,6 +11734,8 @@ void TV::ShowOSDPromptDeleteRecording(PlayerContext *ctx, QString title,
"DIALOG_VIDEOEXIT_JUSTDELETE_0");
osd->DialogAddButton(tr("No, keep it, I changed my mind"),
"DIALOG_VIDEOEXIT_JUSTEXIT_0", false, true);
+ if (!paused)
+ osd->DialogBack("", "DIALOG_PLAY_0_0", true);
}
QMutexLocker locker(&timerIdLock);