Skip to content

Commit

Permalink
Unpause playback when clearing the Delete Recording OSD dialog (if we
Browse files Browse the repository at this point in the history
paused it to show the dialog).

Refs #9228


git-svn-id: http://svn.mythtv.org/svn/trunk@27254 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
Mark Kendall committed Nov 17, 2010
1 parent 369cb64 commit 3eeb6bf
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion mythtv/libs/libmythtv/tv_play.cpp
Expand Up @@ -9728,6 +9728,10 @@ void TV::OSDDialogEvent(int result, QString text, QString action)
else if (valid && desc[0] == "DELETE") else if (valid && desc[0] == "DELETE")
{ {
} }
else if (valid && desc[0] == "PLAY")
{
DoPlay(actx);
}
else else
{ {
VERBOSE(VB_IMPORTANT, "Unrecognised dialog event."); VERBOSE(VB_IMPORTANT, "Unrecognised dialog event.");
Expand Down Expand Up @@ -11700,7 +11704,8 @@ void TV::ShowOSDPromptDeleteRecording(PlayerContext *ctx, QString title,


ClearOSD(ctx); ClearOSD(ctx);


if (!ctx->paused) bool paused = ctx->paused;
if (!paused)
DoTogglePause(ctx, false); DoTogglePause(ctx, false);


InfoMap infoMap; InfoMap infoMap;
Expand Down Expand Up @@ -11729,6 +11734,8 @@ void TV::ShowOSDPromptDeleteRecording(PlayerContext *ctx, QString title,
"DIALOG_VIDEOEXIT_JUSTDELETE_0"); "DIALOG_VIDEOEXIT_JUSTDELETE_0");
osd->DialogAddButton(tr("No, keep it, I changed my mind"), osd->DialogAddButton(tr("No, keep it, I changed my mind"),
"DIALOG_VIDEOEXIT_JUSTEXIT_0", false, true); "DIALOG_VIDEOEXIT_JUSTEXIT_0", false, true);
if (!paused)
osd->DialogBack("", "DIALOG_PLAY_0_0", true);
} }


QMutexLocker locker(&timerIdLock); QMutexLocker locker(&timerIdLock);
Expand Down

0 comments on commit 3eeb6bf

Please sign in to comment.