summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2010-11-17 07:42:57 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2010-11-17 07:42:57 (GMT)
commite86ba127205c6acbee0dc8f2b3556767426181fd (patch)
treef3cd556306783b2d38b9fbb66225ecafa09da93f
parentd75c28fe5ea1fe266a876ccba89371741441faff (diff)
Backport r27254 from trunk to release-0-24-fixes
Unpause playback when clearing the Delete Recording OSD dialog (if we paused it to show the dialog). Closes #9228 git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27255 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 e6a5510..5aab812 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -9673,6 +9673,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.");
@@ -11647,7 +11651,8 @@ void TV::ShowOSDPromptDeleteRecording(PlayerContext *ctx, QString title,
ClearOSD(ctx);
- if (!ctx->paused)
+ bool paused = ctx->paused;
+ if (!paused)
DoTogglePause(ctx, false);
InfoMap infoMap;
@@ -11676,6 +11681,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);