Skip to content

Commit

Permalink
Backport r27254 from trunk to release-0-24-fixes
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Mark Kendall committed Nov 17, 2010
1 parent d75c28f commit e86ba12
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion mythtv/libs/libmythtv/tv_play.cpp
Expand Up @@ -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.");
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit e86ba12

Please sign in to comment.